Menu
▾
▴
linux-vax-commit — [LIST CLOSED] Notifications of commits to complete Linux/VAX CVS tree
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
(9) |
Apr
(27) |
May
(5) |
Jun
(8) |
Jul
(50) |
Aug
(286) |
Sep
(2) |
Oct
(43) |
Nov
(4) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(79) |
Feb
(102) |
Mar
(29) |
Apr
(2) |
May
(22) |
Jun
(41) |
Jul
(11) |
Aug
(28) |
Sep
(58) |
Oct
(4) |
Nov
(18) |
Dec
(8) |
| 2002 |
Jan
(2) |
Feb
(2) |
Mar
(1) |
Apr
(478) |
May
(469) |
Jun
(78) |
Jul
(16) |
Aug
(2) |
Sep
(7) |
Oct
(47) |
Nov
(5) |
Dec
(227) |
| 2003 |
Jan
(155) |
Feb
(188) |
Mar
(160) |
Apr
(172) |
May
(41) |
Jun
(205) |
Jul
(104) |
Aug
(289) |
Sep
(31) |
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Kenn H. <ke...@us...> - 2003-06-26 23:27:46
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv13801/arch/vax/kernel
Modified Files:
entry.S ptrace.c
Log Message:
sys_security goes away in 2.5.50
Index: entry.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/entry.S,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- entry.S 26 Jun 2003 22:14:28 -0000 1.10
+++ entry.S 26 Jun 2003 23:27:41 -0000 1.11
@@ -476,7 +476,6 @@
.long sys_getdents64 /* 220 */
.long sys_fcntl64
.long sys_tkill
- .long sys_security
/*
* NOTE!! This doesn't have to be exact - we just have
Index: ptrace.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/ptrace.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ptrace.c 3 Mar 2003 00:54:12 -0000 1.9
+++ ptrace.c 26 Jun 2003 23:27:41 -0000 1.10
@@ -165,7 +165,7 @@
if (current->ptrace & PT_PTRACED) {
res = -EPERM;
goto out;
- res = security_ops->ptrace(current->parent, current);
+ res = security_ptrace(current->parent, current);
if (res)
goto out;
}
|
|
From: Kenn H. <ke...@us...> - 2003-06-26 23:26:57
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-i386 In directory sc8-pr-cvs1:/tmp/cvs-serv13735/include/asm-i386 Removed Files: string-486.h Log Message: Merge with 2.5.50 --- string-486.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-06-26 23:08:08
|
Update of /cvsroot/linux-vax/kernel-2.5 In directory sc8-pr-cvs1:/tmp/cvs-serv11087 Modified Files: Makefile Log Message: Merge with 2.5.50 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- Makefile 22 Jun 2003 16:18:53 -0000 1.57 +++ Makefile 26 Jun 2003 23:08:06 -0000 1.58 @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 5 -SUBLEVEL = 49 +SUBLEVEL = 50 EXTRAVERSION = # *DOCUMENTATION* @@ -168,7 +168,10 @@ CPPFLAGS := -D__KERNEL__ -Iinclude CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \ - -fomit-frame-pointer -fno-strict-aliasing -fno-common + -fno-strict-aliasing -fno-common +ifndef CONFIG_FRAME_POINTER +CFLAGS += -fomit-frame-pointer +endif AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS) export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \ |
|
From: Kenn H. <ke...@us...> - 2003-06-26 23:07:13
|
Update of /cvsroot/linux-vax/kernel-2.5/init
In directory sc8-pr-cvs1:/tmp/cvs-serv10947/init
Modified Files:
do_mounts.c
Log Message:
Merge with 2.5.50
Index: do_mounts.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/init/do_mounts.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- do_mounts.c 19 Jun 2003 23:31:47 -0000 1.3
+++ do_mounts.c 26 Jun 2003 23:07:10 -0000 1.4
@@ -13,6 +13,7 @@
#include <linux/suspend.h>
#include <linux/root_dev.h>
#include <linux/mount.h>
+#include <linux/security.h>
#include <linux/nfs_fs.h>
#include <linux/nfs_fs_sb.h>
@@ -595,7 +596,8 @@
#ifdef CONFIG_BLK_DEV_RAM
int in_fd, out_fd;
- int nblocks, rd_blocks, devblocks, i;
+ unsigned long rd_blocks, devblocks;
+ int nblocks, i;
char *buf;
unsigned short rotate = 0;
#if !defined(CONFIG_ARCH_S390) && !defined(CONFIG_PPC_ISERIES)
@@ -887,7 +889,7 @@
sys_umount("/dev", 0);
sys_mount(".", "/", NULL, MS_MOVE, NULL);
sys_chroot(".");
- security_ops->sb_post_mountroot();
+ security_sb_post_mountroot();
mount_devfs_fs ();
}
|
|
From: Kenn H. <ke...@us...> - 2003-06-26 23:07:13
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/ide
In directory sc8-pr-cvs1:/tmp/cvs-serv10947/drivers/ide
Modified Files:
ide-tcq.c
Log Message:
Merge with 2.5.50
Index: ide-tcq.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/ide/ide-tcq.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ide-tcq.c 22 Mar 2003 19:45:00 -0000 1.3
+++ ide-tcq.c 26 Jun 2003 23:07:10 -0000 1.4
@@ -148,14 +148,14 @@
ide_hwif_t *hwif = HWIF(drive);
unsigned long flags;
- printk("ide_tcq_intr_timeout: timeout waiting for %s interrupt\n", hwgroup->rq ? "completion" : "service");
+ printk(KERN_ERR "ide_tcq_intr_timeout: timeout waiting for %s interrupt\n", hwgroup->rq ? "completion" : "service");
spin_lock_irqsave(&ide_lock, flags);
if (!hwgroup->busy)
- printk("ide_tcq_intr_timeout: hwgroup not busy\n");
+ printk(KERN_ERR "ide_tcq_intr_timeout: hwgroup not busy\n");
if (hwgroup->handler == NULL)
- printk("ide_tcq_intr_timeout: missing isr!\n");
+ printk(KERN_ERR "ide_tcq_intr_timeout: missing isr!\n");
hwgroup->busy = 1;
spin_unlock_irqrestore(&ide_lock, flags);
@@ -261,7 +261,7 @@
hwif->OUTB(WIN_QUEUED_SERVICE, IDE_COMMAND_REG);
if (ide_tcq_wait_altstat(drive, &stat, BUSY_STAT)) {
- printk("ide_service: BUSY clear took too long\n");
+ printk(KERN_ERR "ide_service: BUSY clear took too long\n");
ide_dump_status(drive, "ide_service", stat);
ide_tcq_invalidate_queue(drive);
return ide_stopped;
@@ -284,7 +284,7 @@
feat = hwif->INB(IDE_NSECTOR_REG);
if (feat & REL) {
HWGROUP(drive)->rq = NULL;
- printk("%s: release in service\n", drive->name);
+ printk(KERN_ERR "%s: release in service\n", drive->name);
return ide_stopped;
}
@@ -307,7 +307,7 @@
return HWIF(drive)->ide_dma_queued_start(drive);
}
- printk("ide_service: missing request for tag %d\n", tag);
+ printk(KERN_ERR "ide_service: missing request for tag %d\n", tag);
spin_unlock_irqrestore(&ide_lock, flags);
return ide_stopped;
}
@@ -347,14 +347,14 @@
* must be end of I/O, check status and complete as necessary
*/
if (unlikely(!OK_STAT(stat, READY_STAT, drive->bad_wstat | DRQ_STAT))) {
- printk("ide_dmaq_intr: %s: error status %x\n",drive->name,stat);
+ printk(KERN_ERR "ide_dmaq_intr: %s: error status %x\n",drive->name,stat);
ide_dump_status(drive, "ide_dmaq_complete", stat);
ide_tcq_invalidate_queue(drive);
return ide_stopped;
}
if (dma_stat)
- printk("%s: bad DMA status (dma_stat=%x)\n", drive->name, dma_stat);
+ printk(KERN_WARNING "%s: bad DMA status (dma_stat=%x)\n", drive->name, dma_stat);
TCQ_PRINTK("ide_dmaq_complete: ending %p, tag %d\n", rq, rq->tag);
ide_end_request(drive, 1, rq->nr_sectors);
@@ -465,7 +465,7 @@
args->command_type = ide_cmd_type_parser(args);
if (ide_raw_taskfile(drive, args, NULL)) {
- printk("%s: failed to enable write cache\n", drive->name);
+ printk(KERN_WARNING "%s: failed to enable write cache\n", drive->name);
goto err;
}
@@ -479,7 +479,7 @@
args->command_type = ide_cmd_type_parser(args);
if (ide_raw_taskfile(drive, args, NULL)) {
- printk("%s: disabling release interrupt fail\n", drive->name);
+ printk(KERN_ERR "%s: disabling release interrupt fail\n", drive->name);
goto err;
}
@@ -493,7 +493,7 @@
args->command_type = ide_cmd_type_parser(args);
if (ide_raw_taskfile(drive, args, NULL)) {
- printk("%s: enabling service interrupt fail\n", drive->name);
+ printk(KERN_ERR "%s: enabling service interrupt fail\n", drive->name);
goto err;
}
#endif
@@ -518,7 +518,7 @@
*/
if (!on) {
if (drive->using_tcq)
- printk("%s: TCQ disabled\n", drive->name);
+ printk(KERN_INFO "%s: TCQ disabled\n", drive->name);
drive->using_tcq = 0;
return 0;
@@ -541,7 +541,7 @@
ide_tcq_check_autopoll(drive);
if (depth != drive->queue_depth)
- printk("%s: tagged command queueing enabled, command queue depth %d\n", drive->name, drive->queue_depth);
+ printk(KERN_INFO "%s: tagged command queueing enabled, command queue depth %d\n", drive->name, drive->queue_depth);
drive->using_tcq = 1;
return 0;
@@ -588,7 +588,7 @@
return 1;
if (ata_pending_commands(drive)) {
- printk("ide-tcq; can't toggle tcq feature on busy drive\n");
+ printk(KERN_WARNING "ide-tcq; can't toggle tcq feature on busy drive\n");
return 1;
}
@@ -692,10 +692,10 @@
TCQ_PRINTK("ide_dma: setting up queued tag=%d\n", rq->tag);
if (!hwgroup->busy)
- printk("queued_rw: hwgroup not busy\n");
+ printk(KERN_ERR "queued_rw: hwgroup not busy\n");
if (ide_tcq_wait_dataphase(drive)) {
- printk("timeout waiting for data phase\n");
+ printk(KERN_WARNING "timeout waiting for data phase\n");
return ide_stopped;
}
|
|
From: Kenn H. <ke...@us...> - 2003-06-26 23:07:12
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char In directory sc8-pr-cvs1:/tmp/cvs-serv10947/drivers/char Modified Files: Makefile Removed Files: i810-tco.h wd501p.h Log Message: Merge with 2.5.50 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- Makefile 22 Jun 2003 16:18:53 -0000 1.30 +++ Makefile 26 Jun 2003 23:07:10 -0000 1.31 @@ -79,7 +79,7 @@ obj-$(CONFIG_NWFLASH) += nwflash.o obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o -obj-$(CONFIG_WATCHDOGS) += watchdog/ +obj-$(CONFIG_WATCHDOG) += watchdog/ obj-$(CONFIG_MWAVE) += mwave/ obj-$(CONFIG_AGP) += agp/ obj-$(CONFIG_DRM) += drm/ --- i810-tco.h DELETED --- --- wd501p.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-06-26 23:05:57
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers In directory sc8-pr-cvs1:/tmp/cvs-serv10806/drivers Modified Files: Makefile Log Message: Merge with 2.5.50 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile 11 May 2003 20:28:21 -0000 1.15 +++ Makefile 26 Jun 2003 23:05:54 -0000 1.16 @@ -8,6 +8,9 @@ obj-$(CONFIG_PCI) += pci/ obj-$(CONFIG_PARISC) += parisc/ obj-$(CONFIG_ACPI) += acpi/ +# PnP must come after ACPI since it will eventually need to check if acpi +# was used and do nothing if so +obj-$(CONFIG_PNP) += pnp/ obj-y += serial/ obj-$(CONFIG_PARPORT) += parport/ obj-y += base/ char/ block/ misc/ net/ media/ @@ -26,7 +29,6 @@ obj-$(CONFIG_ZORRO) += zorro/ obj-$(CONFIG_ALL_PPC) += macintosh/ obj-$(CONFIG_MAC) += macintosh/ -obj-$(CONFIG_PNP) += pnp/ obj-$(CONFIG_SGI) += sgi/ obj-$(CONFIG_VT) += video/ obj-$(CONFIG_PARIDE) += block/paride/ |
|
From: Kenn H. <ke...@us...> - 2003-06-26 22:56:39
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/acorn/scsi In directory sc8-pr-cvs1:/tmp/cvs-serv9560/drivers/acorn/scsi Removed Files: arxescsi.h Log Message: Merge with 2.5.50 --- arxescsi.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-06-26 22:56:39
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/net/hamradio/soundmodem In directory sc8-pr-cvs1:/tmp/cvs-serv9560/drivers/net/hamradio/soundmodem Removed Files: Makefile gentbl.c sm.c sm.h sm_afsk1200.c sm_afsk2400_7.c sm_afsk2400_8.c sm_afsk2666.c sm_fsk9600.c sm_hapn4800.c sm_psk4800.c sm_sbc.c sm_wss.c smdma.h Log Message: Merge with 2.5.50 --- Makefile DELETED --- --- gentbl.c DELETED --- --- sm.c DELETED --- --- sm.h DELETED --- --- sm_afsk1200.c DELETED --- --- sm_afsk2400_7.c DELETED --- --- sm_afsk2400_8.c DELETED --- --- sm_afsk2666.c DELETED --- --- sm_fsk9600.c DELETED --- --- sm_hapn4800.c DELETED --- --- sm_psk4800.c DELETED --- --- sm_sbc.c DELETED --- --- sm_wss.c DELETED --- --- smdma.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-06-26 22:56:39
|
Update of /cvsroot/linux-vax/kernel-2.5/include/linux In directory sc8-pr-cvs1:/tmp/cvs-serv9560/include/linux Removed Files: soundmodem.h Log Message: Merge with 2.5.50 --- soundmodem.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-06-26 22:56:39
|
Update of /cvsroot/linux-vax/kernel-2.5/Documentation/networking In directory sc8-pr-cvs1:/tmp/cvs-serv9560/Documentation/networking Removed Files: soundmodem.txt Log Message: Merge with 2.5.50 --- soundmodem.txt DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-06-26 22:29:04
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv3458
Modified Files:
process.c
Log Message:
do_fork takes another argument that we're not interested in yet
Index: process.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/process.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- process.c 15 Jun 2003 22:33:56 -0000 1.16
+++ process.c 26 Jun 2003 22:15:06 -0000 1.17
@@ -200,7 +200,7 @@
printk("sys_clone: calling do_fork(0x%08lx, 0x%08lx, 0x%p)\n",
clone_flags, newsp, regs);
#endif
- p = do_fork(clone_flags & ~CLONE_IDLETASK, newsp, regs, 0, NULL);
+ p = do_fork(clone_flags & ~CLONE_IDLETASK, newsp, regs, 0, NULL, NULL);
retval = IS_ERR(p) ? PTR_ERR(p) : p->pid;
#ifdef VAX_PROCESS_DEBUG
@@ -212,14 +212,14 @@
int sys_fork(struct pt_regs *regs)
{
struct task_struct *p;
- p = do_fork(SIGCHLD, regs->sp, regs, 0, NULL);
+ p = do_fork(SIGCHLD, regs->sp, regs, 0, NULL, NULL);
return IS_ERR(p) ? PTR_ERR(p) : p->pid;
}
int sys_vfork(struct pt_regs *regs)
{
struct task_struct *p;
- p = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs->sp, regs, 0, NULL);
+ p = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs->sp, regs, 0, NULL, NULL);
return IS_ERR(p) ? PTR_ERR(p) : p->pid;
}
|
|
From: Kenn H. <ke...@us...> - 2003-06-26 22:17:14
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax In directory sc8-pr-cvs1:/tmp/cvs-serv3786 Modified Files: unistd.h Log Message: sys_create_module, sys_get_kernel_syms and sys_query_module all went away in 2.5.48 Index: unistd.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/unistd.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- unistd.h 15 Jun 2003 22:33:56 -0000 1.6 +++ unistd.h 26 Jun 2003 22:17:11 -0000 1.7 @@ -140,10 +140,10 @@ #define __NR_adjtimex 124 #define __NR_mprotect 125 #define __NR_sigprocmask 126 -#define __NR_create_module 127 +//#define __NR_create_module 127 #define __NR_init_module 128 #define __NR_delete_module 129 -#define __NR_get_kernel_syms 130 +//#define __NR_get_kernel_syms 130 #define __NR_quotactl 131 #define __NR_getpgid 132 #define __NR_fchdir 133 @@ -180,7 +180,7 @@ #define __NR_setresuid 164 #define __NR_getresuid 165 #define __NR_vm86 166 -#define __NR_query_module 167 +//#define __NR_query_module 167 #define __NR_poll 168 #define __NR_nfsservctl 169 #define __NR_setresgid 170 |
|
From: Kenn H. <ke...@us...> - 2003-06-26 22:14:31
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1:/tmp/cvs-serv3346 Modified Files: entry.S Log Message: sys_create_module, sys_get_kernel_syms and sys_query_module all went away in 2.5.48 Index: entry.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/entry.S,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- entry.S 15 Jun 2003 22:33:56 -0000 1.9 +++ entry.S 26 Jun 2003 22:14:28 -0000 1.10 @@ -380,10 +380,10 @@ .long sys_adjtimex .long sys_mprotect /* 125 */ .long sys_sigprocmask - .long sys_create_module + .long sys_ni_syscall /* was sys_create_module */ .long sys_init_module .long sys_delete_module - .long sys_get_kernel_syms /* 130 */ + .long sys_ni_syscall /* 130 - was sys_get_kernel_syms*/ .long sys_quotactl .long sys_getpgid .long sys_fchdir @@ -420,7 +420,7 @@ .long sys_setresuid16 .long sys_getresuid16 /* 165 */ .long sys_ni_syscall /* 166 vm86 in i386 */ - .long sys_query_module + .long sys_ni_syscall /* was sys_query_module */ .long sys_poll .long sys_nfsservctl .long sys_setresgid16 /* 170 */ |
|
From: Kenn H. <ke...@us...> - 2003-06-26 22:13:33
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax
In directory sc8-pr-cvs1:/tmp/cvs-serv3130
Modified Files:
vmlinux.lds.S
Log Message:
New section name for the initramfs cpio archive
Index: vmlinux.lds.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/vmlinux.lds.S,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vmlinux.lds.S 18 May 2003 18:22:09 -0000 1.3
+++ vmlinux.lds.S 26 Jun 2003 22:13:09 -0000 1.4
@@ -78,9 +78,10 @@
}
__initcall_end = .;
- .init.ramfs ALIGN(4096): {
+ . = ALIGN(4096);
+ .init.ramfs : {
__initramfs_start = .;
- *(.init.initramfs)
+ *(.init.ramfs)
__initramfs_end = .;
}
|
|
From: Kenn H. <ke...@us...> - 2003-06-22 16:18:57
|
Update of /cvsroot/linux-vax/kernel-2.5/include/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv24069/include/linux
Modified Files:
crypto.h elf.h
Log Message:
Merge with 2.5.49
Index: crypto.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/linux/crypto.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- crypto.h 20 Jun 2003 00:31:31 -0000 1.3
+++ crypto.h 22 Jun 2003 16:18:54 -0000 1.4
@@ -29,7 +29,7 @@
#define CRYPTO_ALG_TYPE_MASK 0x000000ff
#define CRYPTO_ALG_TYPE_CIPHER 0x00000001
#define CRYPTO_ALG_TYPE_DIGEST 0x00000002
-#define CRYPTO_ALG_TYPE_COMP 0x00000004
+#define CRYPTO_ALG_TYPE_COMPRESS 0x00000004
/*
@@ -144,6 +144,9 @@
void (*dit_final)(struct crypto_tfm *tfm, u8 *out);
void (*dit_digest)(struct crypto_tfm *tfm, struct scatterlist *sg,
unsigned int nsg, u8 *out);
+#ifdef CONFIG_CRYPTO_HMAC
+ void *dit_hmac_block;
+#endif
};
struct compress_tfm {
@@ -196,7 +199,6 @@
static inline const char *crypto_tfm_alg_modname(struct crypto_tfm *tfm)
{
- /* Back-port fix from 2.5.49 */
return module_name(tfm->__crt_alg->cra_module);
}
@@ -207,16 +209,19 @@
static inline unsigned int crypto_tfm_alg_min_keysize(struct crypto_tfm *tfm)
{
+ BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
return tfm->__crt_alg->cra_cipher.cia_min_keysize;
}
static inline unsigned int crypto_tfm_alg_max_keysize(struct crypto_tfm *tfm)
{
+ BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
return tfm->__crt_alg->cra_cipher.cia_max_keysize;
}
static inline unsigned int crypto_tfm_alg_ivsize(struct crypto_tfm *tfm)
{
+ BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
return tfm->__crt_alg->cra_cipher.cia_ivsize;
}
@@ -227,6 +232,7 @@
static inline unsigned int crypto_tfm_alg_digestsize(struct crypto_tfm *tfm)
{
+ BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
return tfm->__crt_alg->cra_digest.dia_digestsize;
}
@@ -300,13 +306,13 @@
static inline void crypto_comp_compress(struct crypto_tfm *tfm)
{
- BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMP);
+ BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS);
tfm->crt_compress.cot_compress(tfm);
}
static inline void crypto_comp_decompress(struct crypto_tfm *tfm)
{
- BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMP);
+ BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS);
tfm->crt_compress.cot_decompress(tfm);
}
Index: elf.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/linux/elf.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- elf.h 19 Jun 2003 23:31:47 -0000 1.6
+++ elf.h 22 Jun 2003 16:18:54 -0000 1.7
@@ -202,6 +202,10 @@
#define ELF64_R_SYM(i) ((i) >> 32)
#define ELF64_R_TYPE(i) ((i) & 0xffffffff)
+#define R_ARM_NONE 0
+#define R_ARM_PC24 1
+#define R_ARM_ABS32 2
+
#define R_386_NONE 0
#define R_386_32 1
#define R_386_PC32 2
@@ -414,6 +418,37 @@
#define R_PPC_SECTOFF_HA 36
/* Keep this the last entry. */
#define R_PPC_NUM 37
+
+/* s390 relocations defined by the ABIs */
+#define R_390_NONE 0 /* No reloc. */
+#define R_390_8 1 /* Direct 8 bit. */
+#define R_390_12 2 /* Direct 12 bit. */
+#define R_390_16 3 /* Direct 16 bit. */
+#define R_390_32 4 /* Direct 32 bit. */
+#define R_390_PC32 5 /* PC relative 32 bit. */
+#define R_390_GOT12 6 /* 12 bit GOT offset. */
+#define R_390_GOT32 7 /* 32 bit GOT offset. */
+#define R_390_PLT32 8 /* 32 bit PC relative PLT address. */
+#define R_390_COPY 9 /* Copy symbol at runtime. */
+#define R_390_GLOB_DAT 10 /* Create GOT entry. */
+#define R_390_JMP_SLOT 11 /* Create PLT entry. */
+#define R_390_RELATIVE 12 /* Adjust by program base. */
+#define R_390_GOTOFF 13 /* 32 bit offset to GOT. */
+#define R_390_GOTPC 14 /* 32 bit PC relative offset to GOT. */
+#define R_390_GOT16 15 /* 16 bit GOT offset. */
+#define R_390_PC16 16 /* PC relative 16 bit. */
+#define R_390_PC16DBL 17 /* PC relative 16 bit shifted by 1. */
+#define R_390_PLT16DBL 18 /* 16 bit PC rel. PLT shifted by 1. */
+#define R_390_PC32DBL 19 /* PC relative 32 bit shifted by 1. */
+#define R_390_PLT32DBL 20 /* 32 bit PC rel. PLT shifted by 1. */
+#define R_390_GOTPCDBL 21 /* 32 bit PC rel. GOT shifted by 1. */
+#define R_390_64 22 /* Direct 64 bit. */
+#define R_390_PC64 23 /* PC relative 64 bit. */
+#define R_390_GOT64 24 /* 64 bit GOT offset. */
+#define R_390_PLT64 25 /* 64 bit PC relative PLT address. */
+#define R_390_GOTENT 26 /* 32 bit PC rel. to GOT entry >> 1. */
+/* Keep this the last entry. */
+#define R_390_NUM 27
/* Legal values for e_flags field of Elf64_Ehdr. */
|
|
From: Kenn H. <ke...@us...> - 2003-06-22 16:18:57
|
Update of /cvsroot/linux-vax/kernel-2.5/fs In directory sc8-pr-cvs1:/tmp/cvs-serv24069/fs Removed Files: devices.c Log Message: Merge with 2.5.49 --- devices.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-06-22 16:18:57
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/s390/char In directory sc8-pr-cvs1:/tmp/cvs-serv24069/drivers/s390/char Removed Files: hwc.h hwc_con.c hwc_cpi.c hwc_rw.c hwc_rw.h hwc_tty.c Log Message: Merge with 2.5.49 --- hwc.h DELETED --- --- hwc_con.c DELETED --- --- hwc_cpi.c DELETED --- --- hwc_rw.c DELETED --- --- hwc_rw.h DELETED --- --- hwc_tty.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-06-22 16:18:56
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/pci In directory sc8-pr-cvs1:/tmp/cvs-serv24069/drivers/pci Removed Files: compat.c Log Message: Merge with 2.5.49 --- compat.c DELETED --- |
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char In directory sc8-pr-cvs1:/tmp/cvs-serv24069/drivers/char Modified Files: Makefile tty_io.c Removed Files: acquirewdt.c advantechwdt.c eurotechwdt.c i810-tco.c ib700wdt.c machzwd.c mixcomwd.c pcwd.c sbc60xxwdt.c scx200_wdt.c shwdt.c softdog.c w83877f_wdt.c wdt.c wdt285.c wdt977.c wdt_pci.c Log Message: Merge with 2.5.49 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- Makefile 11 May 2003 20:28:22 -0000 1.29 +++ Makefile 22 Jun 2003 16:18:53 -0000 1.30 @@ -79,31 +79,12 @@ obj-$(CONFIG_NWFLASH) += nwflash.o obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o -# Only one watchdog can succeed. We probe the hardware watchdog -# drivers first, then the softdog driver. This means if your hardware -# watchdog dies or is 'borrowed' for some reason the software watchdog -# still gives you some cover. - -obj-$(CONFIG_PCWATCHDOG) += pcwd.o -obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o -obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o -obj-$(CONFIG_IB700_WDT) += ib700wdt.o -obj-$(CONFIG_MIXCOMWD) += mixcomwd.o -obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o -obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o -obj-$(CONFIG_WDT) += wdt.o -obj-$(CONFIG_WDTPCI) += wdt_pci.o -obj-$(CONFIG_21285_WATCHDOG) += wdt285.o -obj-$(CONFIG_977_WATCHDOG) += wdt977.o -obj-$(CONFIG_I810_TCO) += i810-tco.o -obj-$(CONFIG_MACHZ_WDT) += machzwd.o -obj-$(CONFIG_SH_WDT) += shwdt.o -obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o -obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o +obj-$(CONFIG_WATCHDOGS) += watchdog/ obj-$(CONFIG_MWAVE) += mwave/ obj-$(CONFIG_AGP) += agp/ obj-$(CONFIG_DRM) += drm/ obj-$(CONFIG_PCMCIA) += pcmcia/ + # Files generated that shall be removed upon make clean clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c Index: tty_io.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- tty_io.c 19 Jun 2003 23:31:47 -0000 1.13 +++ tty_io.c 22 Jun 2003 16:18:53 -0000 1.14 @@ -146,10 +146,9 @@ extern void console_8xx_init(void); extern int rs_8xx_init(void); extern void mac_scc_console_init(void); -extern void hwc_console_init(void); -extern void hwc_tty_init(void); +extern void sclp_console_init(void); +extern void sclp_tty_init(void); extern void con3215_init(void); -extern void tty3215_init(void); extern void tub3270_con_init(void); extern void tub3270_init(void); extern void uart_console_init(void); @@ -2210,8 +2209,8 @@ #ifdef CONFIG_TN3215 con3215_init(); #endif -#ifdef CONFIG_HWC - hwc_console_init(); +#ifdef CONFIG_SCLP_CONSOLE + sclp_console_init(); #endif #ifdef CONFIG_STDIO_CONSOLE stdio_console_init(); @@ -2351,8 +2350,8 @@ #ifdef CONFIG_TN3215 tty3215_init(); #endif -#ifdef CONFIG_HWC - hwc_tty_init(); +#ifdef CONFIG_SCLP + sclp_tty_init(); #endif #ifdef CONFIG_A2232 a2232board_init(); --- acquirewdt.c DELETED --- --- advantechwdt.c DELETED --- --- eurotechwdt.c DELETED --- --- i810-tco.c DELETED --- --- ib700wdt.c DELETED --- --- machzwd.c DELETED --- --- mixcomwd.c DELETED --- --- pcwd.c DELETED --- --- sbc60xxwdt.c DELETED --- --- scx200_wdt.c DELETED --- --- shwdt.c DELETED --- --- softdog.c DELETED --- --- w83877f_wdt.c DELETED --- --- wdt.c DELETED --- --- wdt285.c DELETED --- --- wdt977.c DELETED --- --- wdt_pci.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-06-22 16:18:56
|
Update of /cvsroot/linux-vax/kernel-2.5 In directory sc8-pr-cvs1:/tmp/cvs-serv24069 Modified Files: Makefile Log Message: Merge with 2.5.49 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- Makefile 19 Jun 2003 23:31:46 -0000 1.56 +++ Makefile 22 Jun 2003 16:18:53 -0000 1.57 @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 5 -SUBLEVEL = 48 +SUBLEVEL = 49 EXTRAVERSION = # *DOCUMENTATION* @@ -157,7 +157,7 @@ OBJDUMP = $(CROSS_COMPILE)objdump AWK = awk GENKSYMS = /sbin/genksyms -KALLSYMS = /sbin/kallsyms +KALLSYMS = scripts/kallsyms PERL = perl MODFLAGS = -DMODULE CFLAGS_MODULE = $(MODFLAGS) @@ -299,6 +299,8 @@ endef # set -e makes the rule exit immediately on error +# Final awk script makes sure per-cpu vars are in per-cpu section, as +# old gcc (eg egcs 2.92.11) ignores section attribute if uninitialized. define rule_vmlinux__ set -e @@ -312,11 +314,22 @@ echo 'cmd_$@ := $(cmd_vmlinux__)' > $(@D)/.$(@F).cmd endef -define rule_vmlinux +define rule_vmlinux_no_percpu $(rule_vmlinux__) $(NM) $@ | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map endef +ifdef CONFIG_SMP +define rule_vmlinux + $(rule_vmlinux_no_percpu) + $(AWK) -f scripts/per-cpu-check.awk < System.map +endef +else +define rule_vmlinux + $(rule_vmlinux_no_percpu) +endef +endif + LDFLAGS_vmlinux += -T arch/$(ARCH)/vmlinux.lds.s # Generate section listing all symbols and add it into vmlinux @@ -335,7 +348,7 @@ kallsyms.o := .tmp_kallsyms2.o quiet_cmd_kallsyms = KSYM $@ -cmd_kallsyms = $(KALLSYMS) $< > $@ +cmd_kallsyms = sh $(KALLSYMS) $< $@ .tmp_kallsyms1.o: .tmp_vmlinux1 $(call cmd,kallsyms) |
|
From: Kenn H. <ke...@us...> - 2003-06-20 00:31:37
|
Update of /cvsroot/linux-vax/kernel-2.5/include/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv25580/include/linux
Modified Files:
crypto.h
Log Message:
Oops - comment was in wrong function
Index: crypto.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/linux/crypto.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- crypto.h 20 Jun 2003 00:19:20 -0000 1.2
+++ crypto.h 20 Jun 2003 00:31:31 -0000 1.3
@@ -196,12 +196,12 @@
static inline const char *crypto_tfm_alg_modname(struct crypto_tfm *tfm)
{
+ /* Back-port fix from 2.5.49 */
return module_name(tfm->__crt_alg->cra_module);
}
static inline u32 crypto_tfm_alg_type(struct crypto_tfm *tfm)
{
- /* Back-port fix from 2.5.49 */
return tfm->__crt_alg->cra_flags & CRYPTO_ALG_TYPE_MASK;
}
|
|
From: Kenn H. <ke...@us...> - 2003-06-20 00:20:06
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1:/tmp/cvs-serv24147/arch/vax/kernel Modified Files: time.c Log Message: Need to include linux/interrupt.c Index: time.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/time.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- time.c 16 Feb 2003 02:10:03 -0000 1.8 +++ time.c 20 Jun 2003 00:19:57 -0000 1.9 @@ -20,6 +20,7 @@ #include <linux/kernel.h> #include <linux/sched.h> +#include <linux/interrupt.h> #include <linux/init.h> #include <linux/time.h> |
|
From: Kenn H. <ke...@us...> - 2003-06-20 00:19:22
|
Update of /cvsroot/linux-vax/kernel-2.5/include/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv24064/include/linux
Modified Files:
crypto.h
Log Message:
Back-port an upcoming fix from 2.5.49 to allow non-modular kernels to
compile skbuff.c
Index: crypto.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/linux/crypto.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- crypto.h 15 Jun 2003 23:14:58 -0000 1.1.1.2
+++ crypto.h 20 Jun 2003 00:19:20 -0000 1.2
@@ -196,16 +196,12 @@
static inline const char *crypto_tfm_alg_modname(struct crypto_tfm *tfm)
{
- struct crypto_alg *alg = tfm->__crt_alg;
-
- if (alg->cra_module)
- return alg->cra_module->name;
- else
- return NULL;
+ return module_name(tfm->__crt_alg->cra_module);
}
static inline u32 crypto_tfm_alg_type(struct crypto_tfm *tfm)
{
+ /* Back-port fix from 2.5.49 */
return tfm->__crt_alg->cra_flags & CRYPTO_ALG_TYPE_MASK;
}
|
|
From: Kenn H. <ke...@us...> - 2003-06-20 00:18:50
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv23981/include/asm-vax
Modified Files:
stat.h
Log Message:
Add nanosecond fields to stat structures
Index: stat.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/stat.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- stat.h 20 May 2002 00:33:39 -0000 1.3
+++ stat.h 20 Jun 2003 00:18:45 -0000 1.4
@@ -31,11 +31,11 @@
unsigned long st_blksize;
unsigned long st_blocks;
unsigned long st_atime;
- unsigned long __unused1;
+ unsigned long st_atime_nsec;
unsigned long st_mtime;
- unsigned long __unused2;
+ unsigned long st_mtime_nsec;
unsigned long st_ctime;
- unsigned long __unused3;
+ unsigned long st_ctime_nsec;
unsigned long __unused4;
unsigned long __unused5;
};
@@ -64,13 +64,13 @@
unsigned long __pad4; /* future possible st_blocks high bits */
unsigned long st_atime;
- unsigned long __pad5;
+ unsigned long st_atime_nsec;
unsigned long st_mtime;
- unsigned long __pad6;
+ unsigned long st_mtime_nsec;
unsigned long st_ctime;
- unsigned long __pad7; /* will be high 32 bits of ctime someday */
+ unsigned long st_ctime_nsec;
unsigned long __unused1;
unsigned long __unused2;
|
