From: Linus Torvalds Date: Fri, 23 Nov 2007 20:36:39 +0000 (-0500) Subject: Import 2.4.0-test4pre4 X-Git-Tag: 2.4.0-test4pre4 X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=79e75677987c2fd100cbbd1281e373370656ef73;p=history.git Import 2.4.0-test4pre4 --- diff --git a/CREDITS b/CREDITS index a7beebcd70e9..af6c3d6d4708 100644 --- a/CREDITS +++ b/CREDITS @@ -1387,6 +1387,7 @@ E: greg@kroah.com W: http://www.kroah.com/linux-usb/ D: USB Serial Converter driver framework, USB Handspring Visor driver D: ConnectTech WHITEHeat USB driver, Generic USB Serial driver +D: USB Bluetooth driver D: bits and pieces of USB core code. N: Russell Kroll diff --git a/MAINTAINERS b/MAINTAINERS index a2140268a030..3cec9bac7f3a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1159,6 +1159,13 @@ M: vojtech@suse.cz L: linux-usb@suse.com S: Supported +USB BLUETOOTH DRIVER +P: Greg Kroah-Hartman +M: greg@kroah.com +L: linux-usb@suse.com +S: Maintained +W: http://www.kroah.com/linux-usb/ + USB HID/HIDBP/INPUT DRIVERS P: Vojtech Pavlik M: vojtech@suse.cz diff --git a/arch/alpha/boot/tools/objstrip.c b/arch/alpha/boot/tools/objstrip.c index 765e68f2e3a5..5694960614ac 100644 --- a/arch/alpha/boot/tools/objstrip.c +++ b/arch/alpha/boot/tools/objstrip.c @@ -150,7 +150,7 @@ main (int argc, char *argv[]) prog_name, inname); exit(1); } - if (!elf_check_arch(elf->e_machine)) { + if (!elf_check_arch(elf)) { fprintf(stderr, "%s: is not for this processor (e_machine=%d)\n", prog_name, elf->e_machine); exit(1); diff --git a/arch/ia64/boot/bootloader.c b/arch/ia64/boot/bootloader.c index cb6fc1f96733..b73f396dcbca 100644 --- a/arch/ia64/boot/bootloader.c +++ b/arch/ia64/boot/bootloader.c @@ -157,7 +157,7 @@ _start (void) cons_write("not an ELF executable\n"); return; } - if (!elf_check_arch(elf->e_machine)) { + if (!elf_check_arch(elf)) { cons_write("kernel not for this processor\n"); return; } diff --git a/arch/mips64/kernel/binfmt_elf32.c b/arch/mips64/kernel/binfmt_elf32.c index a199839a6404..6d59c35d2eb6 100644 --- a/arch/mips64/kernel/binfmt_elf32.c +++ b/arch/mips64/kernel/binfmt_elf32.c @@ -28,7 +28,7 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG]; typedef double elf_fpreg_t; typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; -#define elf_check_arch(x) ((x) == EM_MIPS || (x) == EM_MIPS_RS4_BE) +#define elf_check_arch(x) ((x)->e_machine == EM_MIPS || (x)->e_machine == EM_MIPS_RS4_BE) #define TASK32_SIZE 0x80000000UL #undef ELF_ET_DYN_BASE diff --git a/arch/sparc/defconfig b/arch/sparc/defconfig index 0813c9501323..b4b50975d932 100644 --- a/arch/sparc/defconfig +++ b/arch/sparc/defconfig @@ -300,7 +300,7 @@ CONFIG_NFSD=m CONFIG_SUNRPC=y CONFIG_LOCKD=y CONFIG_SMB_FS=m -CONFIG_NCP_FS=m +# CONFIG_NCP_FS is not set # CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set # CONFIG_NCPFS_STRONG is not set diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c index 857658391527..f119c59ac257 100644 --- a/arch/sparc/kernel/process.c +++ b/arch/sparc/kernel/process.c @@ -1,4 +1,4 @@ -/* $Id: process.c,v 1.150 2000/07/11 18:49:22 anton Exp $ +/* $Id: process.c,v 1.151 2000/07/11 23:22:17 davem Exp $ * linux/arch/sparc/kernel/process.c * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c index 4d1a8db1cc13..a51995713a91 100644 --- a/arch/sparc/kernel/sparc_ksyms.c +++ b/arch/sparc/kernel/sparc_ksyms.c @@ -1,4 +1,4 @@ -/* $Id: sparc_ksyms.c,v 1.100 2000/07/07 07:49:08 anton Exp $ +/* $Id: sparc_ksyms.c,v 1.101 2000/07/12 00:25:32 anton Exp $ * arch/sparc/kernel/ksyms.c: Sparc specific ksyms support. * * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) @@ -19,6 +19,9 @@ #include #include #include +#ifdef CONFIG_PCI +#include +#endif #include #include @@ -42,9 +45,6 @@ #include #include #endif -#ifdef CONFIG_PCI -#include -#endif #include #include diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 3cf68e2b5baf..55e8516c6087 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig @@ -437,17 +437,17 @@ CONFIG_SUNRPC=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y CONFIG_SMB_FS=m -CONFIG_NCP_FS=m -CONFIG_NCPFS_PACKET_SIGNING=y -CONFIG_NCPFS_IOCTL_LOCKING=y -CONFIG_NCPFS_STRONG=y -CONFIG_NCPFS_NFS_NS=y -CONFIG_NCPFS_OS2_NS=y -CONFIG_NCPFS_SMALLDOS=y -CONFIG_NCPFS_MOUNT_SUBDIR=y -CONFIG_NCPFS_NDS_DOMAINS=y -CONFIG_NCPFS_NLS=y -CONFIG_NCPFS_EXTRAS=y +# CONFIG_NCP_FS is not set +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_MOUNT_SUBDIR is not set +# CONFIG_NCPFS_NDS_DOMAINS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set # # Partition Types diff --git a/arch/sparc64/kernel/binfmt_elf32.c b/arch/sparc64/kernel/binfmt_elf32.c index 59b48600d845..6d9e291d4552 100644 --- a/arch/sparc64/kernel/binfmt_elf32.c +++ b/arch/sparc64/kernel/binfmt_elf32.c @@ -79,7 +79,7 @@ typedef struct { } pr_un; } elf_xregset_t; -#define elf_check_arch(x) (((x) == EM_SPARC) || ((x) == EM_SPARC32PLUS)) +#define elf_check_arch(x) (((x)->e_machine == EM_SPARC) || ((x)->e_machine == EM_SPARC32PLUS)) #define ELF_ET_DYN_BASE 0x08000000 diff --git a/arch/sparc64/solaris/timod.c b/arch/sparc64/solaris/timod.c index 37f38c75bd56..aedb0f17d7c6 100644 --- a/arch/sparc64/solaris/timod.c +++ b/arch/sparc64/solaris/timod.c @@ -1,4 +1,4 @@ -/* $Id: timod.c,v 1.7 2000/06/09 07:35:30 davem Exp $ +/* $Id: timod.c,v 1.8 2000/07/12 00:51:06 davem Exp $ * timod.c: timod emulation. * * Copyright (C) 1998 Patrik Rak (prak3264@ss1000.ms.mff.cuni.cz) @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -619,22 +620,6 @@ int timod_putmsg(unsigned int fd, char *ctl_buf, int ctl_len, return -EINVAL; } -/* copied directly from fs/select.c */ - -static void free_wait(poll_table * p) -{ - struct poll_table_entry * entry = p->entry + p->nr; - - SOLD("entry"); - while (p->nr > 0) { - p->nr--; - entry--; - remove_wait_queue(entry->wait_address,&entry->wait); - } - SOLD("done"); -} - - int timod_getmsg(unsigned int fd, char *ctl_buf, int ctl_maxlen, s32 *ctl_len, char *data_buf, int data_maxlen, s32 *data_len, int *flags_p) { @@ -670,14 +655,8 @@ int timod_getmsg(unsigned int fd, char *ctl_buf, int ctl_maxlen, s32 *ctl_len, } if (!(filp->f_flags & O_NONBLOCK)) { poll_table wait_table, *wait; - struct poll_table_entry *entry; - SOLD("getting poll_table"); - entry = (struct poll_table_entry *)__get_free_page(GFP_KERNEL); - if (!entry) - return -ENOMEM; - SOLD("got one"); - wait_table.nr = 0; - wait_table.entry = entry; + + poll_initwait(&wait_table); wait = &wait_table; for(;;) { SOLD("loop"); @@ -705,13 +684,17 @@ int timod_getmsg(unsigned int fd, char *ctl_buf, int ctl_maxlen, s32 *ctl_len, SOLD("avoiding lockup"); break ; } + if(wait_table.error) { + SOLD("wait-table error"); + poll_freewait(&wait_table); + return wait_table.error; + } SOLD("scheduling"); schedule(); } SOLD("loop done"); current->state = TASK_RUNNING; - free_wait(&wait_table); - free_page((unsigned long)entry); + poll_freewait(&wait_table); if (signal_pending(current)) { SOLD("signal pending"); return -EINTR; diff --git a/drivers/char/pcmcia/Config.in b/drivers/char/pcmcia/Config.in index 766fdd1d0088..8baf1932e4b6 100644 --- a/drivers/char/pcmcia/Config.in +++ b/drivers/char/pcmcia/Config.in @@ -3,12 +3,12 @@ # if [ "$CONFIG_SERIAL" = "n" ]; then - define_bool CONFIG_PCMCIA_SERIAL n + define_tristate CONFIG_PCMCIA_SERIAL n else if [ "$CONFIG_SERIAL" = "m" -o "$CONFIG_PCMCIA" = "m" ]; then - define_bool CONFIG_PCMCIA_SERIAL m + define_tristate CONFIG_PCMCIA_SERIAL m else - define_bool CONFIG_PCMCIA_SERIAL y + define_tristate CONFIG_PCMCIA_SERIAL y fi fi diff --git a/drivers/usb/bluetooth.c b/drivers/usb/bluetooth.c index aaea67a4cb38..bd7be69e893d 100644 --- a/drivers/usb/bluetooth.c +++ b/drivers/usb/bluetooth.c @@ -1,11 +1,15 @@ /* - * bluetooth.c Version 0.1 + * bluetooth.c Version 0.2 * * Copyright (c) 2000 Greg Kroah-Hartman * * USB Bluetooth driver, based on the Bluetooth Spec version 1.0B * * + * (07/11/2000) Version 0.2 gkh + * Fixed a small bug found by Nils Faerber in the usb_bluetooth_probe + * function. + * * (07/09/2000) Version 0.1 gkh * Initial release. Has support for sending ACL data (which is really just * a HCI frame.) Raw HCI commands and HCI events are not supported. @@ -619,6 +623,7 @@ static void * usb_bluetooth_probe(struct usb_device *dev, unsigned int ifnum) memset(bluetooth, 0, sizeof(struct usb_bluetooth)); + bluetooth->magic = USB_BLUETOOTH_MAGIC; bluetooth->dev = dev; bluetooth->minor = minor; bluetooth->tqueue.routine = bluetooth_softint; @@ -676,6 +681,8 @@ static void * usb_bluetooth_probe(struct usb_device *dev, unsigned int ifnum) tty_register_devfs (&bluetooth_tty_driver, 0, minor); info("Bluetooth converter now attached to ttyBLUE%d (or usb/ttblue/%d for devfs)", minor, minor); + bluetooth_table[minor] = bluetooth; + return bluetooth; /* success */ probe_error: diff --git a/fs/ncpfs/sock.c b/fs/ncpfs/sock.c index c5923a78e90c..171f0cb515e1 100644 --- a/fs/ncpfs/sock.c +++ b/fs/ncpfs/sock.c @@ -87,7 +87,6 @@ static int do_ncp_rpc_call(struct ncp_server *server, int size, int result; char *start = server->packet; poll_table wait_table; - struct poll_table_entry entry; int init_timeout, max_timeout; int timeout; int retrans; @@ -136,8 +135,7 @@ static int do_ncp_rpc_call(struct ncp_server *server, int size, break; } re_select: - wait_table.nr = 0; - wait_table.entry = &entry; + poll_initwait(&wait_table); /* mb() is not necessary because ->poll() will serialize instructions adding the wait_table waitqueues in the waitqueue-head before going to calculate the mask-retval. */ @@ -154,13 +152,16 @@ static int do_ncp_rpc_call(struct ncp_server *server, int size, timeout = max_timeout; } timed_out = !schedule_timeout(timeout); - remove_wait_queue(entry.wait_address, &entry.wait); - fput(file); + poll_freewait(&wait_table); current->state = TASK_RUNNING; if (signal_pending(current)) { result = -ERESTARTSYS; break; } + if(wait_table.error) { + result = wait_table.error; + break; + } if (timed_out) { if (n < retrans) continue; @@ -179,9 +180,8 @@ static int do_ncp_rpc_call(struct ncp_server *server, int size, major_timeout_seen = 1; continue; } - } else if (wait_table.nr) { - remove_wait_queue(entry.wait_address, &entry.wait); - fput(file); + } else { + poll_freewait(&wait_table); } current->state = TASK_RUNNING; @@ -262,7 +262,6 @@ static int do_ncp_rpc_call(struct ncp_server *server, int size, static int do_tcp_rcv(struct ncp_server *server, void *buffer, size_t len) { poll_table wait_table; - struct poll_table_entry entry; struct file *file; struct socket *sock; int init_timeout; @@ -281,16 +280,14 @@ static int do_tcp_rcv(struct ncp_server *server, void *buffer, size_t len) { init_timeout = 0x7FFF0000; while (len) { - wait_table.nr = 0; - wait_table.entry = &entry; + poll_initwait(&wait_table); /* mb() is not necessary because ->poll() will serialize instructions adding the wait_table waitqueues in the waitqueue-head before going to calculate the mask-retval. */ __set_current_state(TASK_INTERRUPTIBLE); if (!(sock->ops->poll(file, sock, &wait_table) & POLLIN)) { init_timeout = schedule_timeout(init_timeout); - remove_wait_queue(entry.wait_address, &entry.wait); - fput(file); + poll_freewait(&wait_table); current->state = TASK_RUNNING; if (signal_pending(current)) { return -ERESTARTSYS; @@ -298,9 +295,11 @@ static int do_tcp_rcv(struct ncp_server *server, void *buffer, size_t len) { if (!init_timeout) { return -EIO; } - } else if (wait_table.nr) { - remove_wait_queue(entry.wait_address, &entry.wait); - fput(file); + if(wait_table.error) { + return wait_table.error; + } + } else { + poll_freewait(&wait_table); } current->state = TASK_RUNNING; diff --git a/fs/select.c b/fs/select.c index a9fd61953ee6..427e7f0f7727 100644 --- a/fs/select.c +++ b/fs/select.c @@ -31,14 +31,15 @@ * understand what I'm doing here, then you understand how the linux * sleep/wakeup mechanism works. * - * Two very simple procedures, poll_wait() and free_wait() make all the + * Two very simple procedures, poll_wait() and poll_freewait() make all the * work. poll_wait() is an inline-function defined in , * as all select/poll functions have to call it to add an entry to the * poll table. */ -static void free_wait(struct poll_table_page * p) +void poll_freewait(poll_table* pt) { + struct poll_table_page * p = pt->table; while (p) { struct poll_table_entry * entry; struct poll_table_page *old; @@ -66,6 +67,7 @@ void __pollwait(struct file * filp, wait_queue_head_t * wait_address, poll_table new_table = (struct poll_table_page *) __get_free_page(GFP_KERNEL); if (!new_table) { p->error = -ENOMEM; + __set_current_state(TASK_RUNNING); return; } new_table->nr = 0; @@ -160,8 +162,7 @@ int do_select(int n, fd_set_bits *fds, long *timeout) return retval; n = retval; - table.error = 0; - table.table = NULL; + poll_initwait(&table); wait = &table; retval = 0; for (;;) { @@ -201,11 +202,15 @@ int do_select(int n, fd_set_bits *fds, long *timeout) wait = NULL; if (retval || !__timeout || signal_pending(current)) break; + if(table.error) { + retval = table.error; + break; + } __timeout = schedule_timeout(__timeout); } current->state = TASK_RUNNING; - free_wait(table.table); + poll_freewait(&table); /* * Up-to-date the caller timeout. @@ -354,18 +359,22 @@ static int do_poll(unsigned int nfds, unsigned int nchunks, unsigned int nleft, struct pollfd *fds[], poll_table *wait, long timeout) { int count = 0; + poll_table* pt = wait; for (;;) { unsigned int i; set_current_state(TASK_INTERRUPTIBLE); for (i=0; i < nchunks; i++) - do_pollfd(POLLFD_PER_PAGE, fds[i], &wait, &count); + do_pollfd(POLLFD_PER_PAGE, fds[i], &pt, &count); if (nleft) - do_pollfd(nleft, fds[nchunks], &wait, &count); - wait = NULL; + do_pollfd(nleft, fds[nchunks], &pt, &count); + pt = NULL; if (count || !timeout || signal_pending(current)) break; + if(wait->error) { + return wait->error; + } timeout = schedule_timeout(timeout); } current->state = TASK_RUNNING; @@ -391,8 +400,7 @@ asmlinkage long sys_poll(struct pollfd * ufds, unsigned int nfds, long timeout) timeout = MAX_SCHEDULE_TIMEOUT; } - table.error = 0; - table.table = NULL; + poll_initwait(&table); err = -ENOMEM; fds = NULL; @@ -452,6 +460,6 @@ out_fds: if (nfds != 0) kfree(fds); out: - free_wait(table.table); + poll_freewait(&table); return err; } diff --git a/include/asm-ia64/ia32.h b/include/asm-ia64/ia32.h index 884f1314ac8d..e5de07a4f634 100644 --- a/include/asm-ia64/ia32.h +++ b/include/asm-ia64/ia32.h @@ -229,7 +229,7 @@ typedef struct siginfo32 { /* * This is used to ensure we don't load something for the wrong architecture. */ -#define elf_check_arch(x) ((x) == EM_386) +#define elf_check_arch(x) ((x)->e_machine == EM_386) /* * These are used to set parameters in the core dumps. diff --git a/include/asm-s390/elf.h b/include/asm-s390/elf.h index eea4560fc224..28c5e47db570 100644 --- a/include/asm-s390/elf.h +++ b/include/asm-s390/elf.h @@ -22,7 +22,7 @@ typedef s390_regs elf_gregset_t; /* * This is used to ensure we don't load something for the wrong architecture. */ -#define elf_check_arch(x) ((x)->elf_machine == EM_S390) +#define elf_check_arch(x) ((x)->e_machine == EM_S390) /* * These are used to set parameters in the core dumps. diff --git a/include/asm-sparc/asm_offsets.h b/include/asm-sparc/asm_offsets.h index d6c868ff097a..3c2d94ff62ba 100644 --- a/include/asm-sparc/asm_offsets.h +++ b/include/asm-sparc/asm_offsets.h @@ -79,112 +79,112 @@ #define AOFF_task_pidhash_pprev 0x00000094 #define ASIZ_task_pidhash_pprev 0x00000004 #define AOFF_task_wait_chldexit 0x00000098 -#define ASIZ_task_wait_chldexit 0x00000014 -#define AOFF_task_vfork_sem 0x000000ac +#define ASIZ_task_wait_chldexit 0x0000000c +#define AOFF_task_vfork_sem 0x000000a4 #define ASIZ_task_vfork_sem 0x00000004 -#define AOFF_task_rt_priority 0x000000b0 +#define AOFF_task_rt_priority 0x000000a8 #define ASIZ_task_rt_priority 0x00000004 -#define AOFF_task_it_real_value 0x000000b4 +#define AOFF_task_it_real_value 0x000000ac #define ASIZ_task_it_real_value 0x00000004 -#define AOFF_task_it_prof_value 0x000000b8 +#define AOFF_task_it_prof_value 0x000000b0 #define ASIZ_task_it_prof_value 0x00000004 -#define AOFF_task_it_virt_value 0x000000bc +#define AOFF_task_it_virt_value 0x000000b4 #define ASIZ_task_it_virt_value 0x00000004 -#define AOFF_task_it_real_incr 0x000000c0 +#define AOFF_task_it_real_incr 0x000000b8 #define ASIZ_task_it_real_incr 0x00000004 -#define AOFF_task_it_prof_incr 0x000000c4 +#define AOFF_task_it_prof_incr 0x000000bc #define ASIZ_task_it_prof_incr 0x00000004 -#define AOFF_task_it_virt_incr 0x000000c8 +#define AOFF_task_it_virt_incr 0x000000c0 #define ASIZ_task_it_virt_incr 0x00000004 -#define AOFF_task_real_timer 0x000000cc +#define AOFF_task_real_timer 0x000000c4 #define ASIZ_task_real_timer 0x00000014 -#define AOFF_task_times 0x000000e0 +#define AOFF_task_times 0x000000d8 #define ASIZ_task_times 0x00000010 -#define AOFF_task_start_time 0x000000f0 +#define AOFF_task_start_time 0x000000e8 #define ASIZ_task_start_time 0x00000004 -#define AOFF_task_per_cpu_utime 0x000000f4 +#define AOFF_task_per_cpu_utime 0x000000ec #define ASIZ_task_per_cpu_utime 0x00000004 -#define AOFF_task_min_flt 0x000000fc +#define AOFF_task_min_flt 0x000000f4 #define ASIZ_task_min_flt 0x00000004 -#define AOFF_task_maj_flt 0x00000100 +#define AOFF_task_maj_flt 0x000000f8 #define ASIZ_task_maj_flt 0x00000004 -#define AOFF_task_nswap 0x00000104 +#define AOFF_task_nswap 0x000000fc #define ASIZ_task_nswap 0x00000004 -#define AOFF_task_cmin_flt 0x00000108 +#define AOFF_task_cmin_flt 0x00000100 #define ASIZ_task_cmin_flt 0x00000004 -#define AOFF_task_cmaj_flt 0x0000010c +#define AOFF_task_cmaj_flt 0x00000104 #define ASIZ_task_cmaj_flt 0x00000004 -#define AOFF_task_cnswap 0x00000110 +#define AOFF_task_cnswap 0x00000108 #define ASIZ_task_cnswap 0x00000004 -#define AOFF_task_uid 0x00000118 +#define AOFF_task_uid 0x00000110 #define ASIZ_task_uid 0x00000004 -#define AOFF_task_euid 0x0000011c +#define AOFF_task_euid 0x00000114 #define ASIZ_task_euid 0x00000004 -#define AOFF_task_suid 0x00000120 +#define AOFF_task_suid 0x00000118 #define ASIZ_task_suid 0x00000004 -#define AOFF_task_fsuid 0x00000124 +#define AOFF_task_fsuid 0x0000011c #define ASIZ_task_fsuid 0x00000004 -#define AOFF_task_gid 0x00000128 +#define AOFF_task_gid 0x00000120 #define ASIZ_task_gid 0x00000004 -#define AOFF_task_egid 0x0000012c +#define AOFF_task_egid 0x00000124 #define ASIZ_task_egid 0x00000004 -#define AOFF_task_sgid 0x00000130 +#define AOFF_task_sgid 0x00000128 #define ASIZ_task_sgid 0x00000004 -#define AOFF_task_fsgid 0x00000134 +#define AOFF_task_fsgid 0x0000012c #define ASIZ_task_fsgid 0x00000004 -#define AOFF_task_ngroups 0x00000138 +#define AOFF_task_ngroups 0x00000130 #define ASIZ_task_ngroups 0x00000004 -#define AOFF_task_groups 0x0000013c +#define AOFF_task_groups 0x00000134 #define ASIZ_task_groups 0x00000080 -#define AOFF_task_cap_effective 0x000001bc +#define AOFF_task_cap_effective 0x000001b4 #define ASIZ_task_cap_effective 0x00000004 -#define AOFF_task_cap_inheritable 0x000001c0 +#define AOFF_task_cap_inheritable 0x000001b8 #define ASIZ_task_cap_inheritable 0x00000004 -#define AOFF_task_cap_permitted 0x000001c4 +#define AOFF_task_cap_permitted 0x000001bc #define ASIZ_task_cap_permitted 0x00000004 -#define AOFF_task_user 0x000001cc +#define AOFF_task_user 0x000001c4 #define ASIZ_task_user 0x00000004 -#define AOFF_task_rlim 0x000001d0 +#define AOFF_task_rlim 0x000001c8 #define ASIZ_task_rlim 0x00000050 -#define AOFF_task_used_math 0x00000220 +#define AOFF_task_used_math 0x00000218 #define ASIZ_task_used_math 0x00000002 -#define AOFF_task_comm 0x00000222 +#define AOFF_task_comm 0x0000021a #define ASIZ_task_comm 0x00000010 -#define AOFF_task_link_count 0x00000234 +#define AOFF_task_link_count 0x0000022c #define ASIZ_task_link_count 0x00000004 -#define AOFF_task_tty 0x00000238 +#define AOFF_task_tty 0x00000230 #define ASIZ_task_tty 0x00000004 -#define AOFF_task_semundo 0x0000023c +#define AOFF_task_semundo 0x00000234 #define ASIZ_task_semundo 0x00000004 -#define AOFF_task_semsleeping 0x00000240 +#define AOFF_task_semsleeping 0x00000238 #define ASIZ_task_semsleeping 0x00000004 -#define AOFF_task_thread 0x00000248 +#define AOFF_task_thread 0x00000240 #define ASIZ_task_thread 0x00000380 -#define AOFF_task_fs 0x000005c8 +#define AOFF_task_fs 0x000005c0 #define ASIZ_task_fs 0x00000004 -#define AOFF_task_files 0x000005cc +#define AOFF_task_files 0x000005c4 #define ASIZ_task_files 0x00000004 -#define AOFF_task_sigmask_lock 0x000005d0 +#define AOFF_task_sigmask_lock 0x000005c8 #define ASIZ_task_sigmask_lock 0x00000004 -#define AOFF_task_sig 0x000005d4 +#define AOFF_task_sig 0x000005cc #define ASIZ_task_sig 0x00000004 -#define AOFF_task_signal 0x000005d8 +#define AOFF_task_signal 0x000005d0 #define ASIZ_task_signal 0x00000008 -#define AOFF_task_blocked 0x000005e0 +#define AOFF_task_blocked 0x000005d8 #define ASIZ_task_blocked 0x00000008 -#define AOFF_task_sigqueue 0x000005e8 +#define AOFF_task_sigqueue 0x000005e0 #define ASIZ_task_sigqueue 0x00000004 -#define AOFF_task_sigqueue_tail 0x000005ec +#define AOFF_task_sigqueue_tail 0x000005e4 #define ASIZ_task_sigqueue_tail 0x00000004 -#define AOFF_task_sas_ss_sp 0x000005f0 +#define AOFF_task_sas_ss_sp 0x000005e8 #define ASIZ_task_sas_ss_sp 0x00000004 -#define AOFF_task_sas_ss_size 0x000005f4 +#define AOFF_task_sas_ss_size 0x000005ec #define ASIZ_task_sas_ss_size 0x00000004 -#define AOFF_task_parent_exec_id 0x000005f8 +#define AOFF_task_parent_exec_id 0x000005f0 #define ASIZ_task_parent_exec_id 0x00000004 -#define AOFF_task_self_exec_id 0x000005fc +#define AOFF_task_self_exec_id 0x000005f4 #define ASIZ_task_self_exec_id 0x00000004 -#define AOFF_task_alloc_lock 0x00000600 +#define AOFF_task_alloc_lock 0x000005f8 #define ASIZ_task_alloc_lock 0x00000004 #define AOFF_mm_mmap 0x00000000 #define ASIZ_mm_mmap 0x00000004 @@ -201,48 +201,48 @@ #define AOFF_mm_map_count 0x00000018 #define ASIZ_mm_map_count 0x00000004 #define AOFF_mm_mmap_sem 0x0000001c -#define ASIZ_mm_mmap_sem 0x00000020 -#define AOFF_mm_page_table_lock 0x0000003c +#define ASIZ_mm_mmap_sem 0x00000014 +#define AOFF_mm_page_table_lock 0x00000030 #define ASIZ_mm_page_table_lock 0x00000004 -#define AOFF_mm_context 0x00000040 +#define AOFF_mm_context 0x00000034 #define ASIZ_mm_context 0x00000004 -#define AOFF_mm_start_code 0x00000044 +#define AOFF_mm_start_code 0x00000038 #define ASIZ_mm_start_code 0x00000004 -#define AOFF_mm_end_code 0x00000048 +#define AOFF_mm_end_code 0x0000003c #define ASIZ_mm_end_code 0x00000004 -#define AOFF_mm_start_data 0x0000004c +#define AOFF_mm_start_data 0x00000040 #define ASIZ_mm_start_data 0x00000004 -#define AOFF_mm_end_data 0x00000050 +#define AOFF_mm_end_data 0x00000044 #define ASIZ_mm_end_data 0x00000004 -#define AOFF_mm_start_brk 0x00000054 +#define AOFF_mm_start_brk 0x00000048 #define ASIZ_mm_start_brk 0x00000004 -#define AOFF_mm_brk 0x00000058 +#define AOFF_mm_brk 0x0000004c #define ASIZ_mm_brk 0x00000004 -#define AOFF_mm_start_stack 0x0000005c +#define AOFF_mm_start_stack 0x00000050 #define ASIZ_mm_start_stack 0x00000004 -#define AOFF_mm_arg_start 0x00000060 +#define AOFF_mm_arg_start 0x00000054 #define ASIZ_mm_arg_start 0x00000004 -#define AOFF_mm_arg_end 0x00000064 +#define AOFF_mm_arg_end 0x00000058 #define ASIZ_mm_arg_end 0x00000004 -#define AOFF_mm_env_start 0x00000068 +#define AOFF_mm_env_start 0x0000005c #define ASIZ_mm_env_start 0x00000004 -#define AOFF_mm_env_end 0x0000006c +#define AOFF_mm_env_end 0x00000060 #define ASIZ_mm_env_end 0x00000004 -#define AOFF_mm_rss 0x00000070 +#define AOFF_mm_rss 0x00000064 #define ASIZ_mm_rss 0x00000004 -#define AOFF_mm_total_vm 0x00000074 +#define AOFF_mm_total_vm 0x00000068 #define ASIZ_mm_total_vm 0x00000004 -#define AOFF_mm_locked_vm 0x00000078 +#define AOFF_mm_locked_vm 0x0000006c #define ASIZ_mm_locked_vm 0x00000004 -#define AOFF_mm_def_flags 0x0000007c +#define AOFF_mm_def_flags 0x00000070 #define ASIZ_mm_def_flags 0x00000004 -#define AOFF_mm_cpu_vm_mask 0x00000080 +#define AOFF_mm_cpu_vm_mask 0x00000074 #define ASIZ_mm_cpu_vm_mask 0x00000004 -#define AOFF_mm_swap_cnt 0x00000084 +#define AOFF_mm_swap_cnt 0x00000078 #define ASIZ_mm_swap_cnt 0x00000004 -#define AOFF_mm_swap_address 0x00000088 +#define AOFF_mm_swap_address 0x0000007c #define ASIZ_mm_swap_address 0x00000004 -#define AOFF_mm_segments 0x0000008c +#define AOFF_mm_segments 0x00000080 #define ASIZ_mm_segments 0x00000004 #define AOFF_thread_uwinmask 0x00000000 #define ASIZ_thread_uwinmask 0x00000004 @@ -360,112 +360,112 @@ #define AOFF_task_pidhash_pprev 0x00000094 #define ASIZ_task_pidhash_pprev 0x00000004 #define AOFF_task_wait_chldexit 0x00000098 -#define ASIZ_task_wait_chldexit 0x00000018 -#define AOFF_task_vfork_sem 0x000000b0 +#define ASIZ_task_wait_chldexit 0x00000010 +#define AOFF_task_vfork_sem 0x000000a8 #define ASIZ_task_vfork_sem 0x00000004 -#define AOFF_task_rt_priority 0x000000b4 +#define AOFF_task_rt_priority 0x000000ac #define ASIZ_task_rt_priority 0x00000004 -#define AOFF_task_it_real_value 0x000000b8 +#define AOFF_task_it_real_value 0x000000b0 #define ASIZ_task_it_real_value 0x00000004 -#define AOFF_task_it_prof_value 0x000000bc +#define AOFF_task_it_prof_value 0x000000b4 #define ASIZ_task_it_prof_value 0x00000004 -#define AOFF_task_it_virt_value 0x000000c0 +#define AOFF_task_it_virt_value 0x000000b8 #define ASIZ_task_it_virt_value 0x00000004 -#define AOFF_task_it_real_incr 0x000000c4 +#define AOFF_task_it_real_incr 0x000000bc #define ASIZ_task_it_real_incr 0x00000004 -#define AOFF_task_it_prof_incr 0x000000c8 +#define AOFF_task_it_prof_incr 0x000000c0 #define ASIZ_task_it_prof_incr 0x00000004 -#define AOFF_task_it_virt_incr 0x000000cc +#define AOFF_task_it_virt_incr 0x000000c4 #define ASIZ_task_it_virt_incr 0x00000004 -#define AOFF_task_real_timer 0x000000d0 +#define AOFF_task_real_timer 0x000000c8 #define ASIZ_task_real_timer 0x00000014 -#define AOFF_task_times 0x000000e4 +#define AOFF_task_times 0x000000dc #define ASIZ_task_times 0x00000010 -#define AOFF_task_start_time 0x000000f4 +#define AOFF_task_start_time 0x000000ec #define ASIZ_task_start_time 0x00000004 -#define AOFF_task_per_cpu_utime 0x000000f8 +#define AOFF_task_per_cpu_utime 0x000000f0 #define ASIZ_task_per_cpu_utime 0x00000080 -#define AOFF_task_min_flt 0x000001f8 +#define AOFF_task_min_flt 0x000001f0 #define ASIZ_task_min_flt 0x00000004 -#define AOFF_task_maj_flt 0x000001fc +#define AOFF_task_maj_flt 0x000001f4 #define ASIZ_task_maj_flt 0x00000004 -#define AOFF_task_nswap 0x00000200 +#define AOFF_task_nswap 0x000001f8 #define ASIZ_task_nswap 0x00000004 -#define AOFF_task_cmin_flt 0x00000204 +#define AOFF_task_cmin_flt 0x000001fc #define ASIZ_task_cmin_flt 0x00000004 -#define AOFF_task_cmaj_flt 0x00000208 +#define AOFF_task_cmaj_flt 0x00000200 #define ASIZ_task_cmaj_flt 0x00000004 -#define AOFF_task_cnswap 0x0000020c +#define AOFF_task_cnswap 0x00000204 #define ASIZ_task_cnswap 0x00000004 -#define AOFF_task_uid 0x00000214 +#define AOFF_task_uid 0x0000020c #define ASIZ_task_uid 0x00000004 -#define AOFF_task_euid 0x00000218 +#define AOFF_task_euid 0x00000210 #define ASIZ_task_euid 0x00000004 -#define AOFF_task_suid 0x0000021c +#define AOFF_task_suid 0x00000214 #define ASIZ_task_suid 0x00000004 -#define AOFF_task_fsuid 0x00000220 +#define AOFF_task_fsuid 0x00000218 #define ASIZ_task_fsuid 0x00000004 -#define AOFF_task_gid 0x00000224 +#define AOFF_task_gid 0x0000021c #define ASIZ_task_gid 0x00000004 -#define AOFF_task_egid 0x00000228 +#define AOFF_task_egid 0x00000220 #define ASIZ_task_egid 0x00000004 -#define AOFF_task_sgid 0x0000022c +#define AOFF_task_sgid 0x00000224 #define ASIZ_task_sgid 0x00000004 -#define AOFF_task_fsgid 0x00000230 +#define AOFF_task_fsgid 0x00000228 #define ASIZ_task_fsgid 0x00000004 -#define AOFF_task_ngroups 0x00000234 +#define AOFF_task_ngroups 0x0000022c #define ASIZ_task_ngroups 0x00000004 -#define AOFF_task_groups 0x00000238 +#define AOFF_task_groups 0x00000230 #define ASIZ_task_groups 0x00000080 -#define AOFF_task_cap_effective 0x000002b8 +#define AOFF_task_cap_effective 0x000002b0 #define ASIZ_task_cap_effective 0x00000004 -#define AOFF_task_cap_inheritable 0x000002bc +#define AOFF_task_cap_inheritable 0x000002b4 #define ASIZ_task_cap_inheritable 0x00000004 -#define AOFF_task_cap_permitted 0x000002c0 +#define AOFF_task_cap_permitted 0x000002b8 #define ASIZ_task_cap_permitted 0x00000004 -#define AOFF_task_user 0x000002c8 +#define AOFF_task_user 0x000002c0 #define ASIZ_task_user 0x00000004 -#define AOFF_task_rlim 0x000002cc +#define AOFF_task_rlim 0x000002c4 #define ASIZ_task_rlim 0x00000050 -#define AOFF_task_used_math 0x0000031c +#define AOFF_task_used_math 0x00000314 #define ASIZ_task_used_math 0x00000002 -#define AOFF_task_comm 0x0000031e +#define AOFF_task_comm 0x00000316 #define ASIZ_task_comm 0x00000010 -#define AOFF_task_link_count 0x00000330 +#define AOFF_task_link_count 0x00000328 #define ASIZ_task_link_count 0x00000004 -#define AOFF_task_tty 0x00000334 +#define AOFF_task_tty 0x0000032c #define ASIZ_task_tty 0x00000004 -#define AOFF_task_semundo 0x00000338 +#define AOFF_task_semundo 0x00000330 #define ASIZ_task_semundo 0x00000004 -#define AOFF_task_semsleeping 0x0000033c +#define AOFF_task_semsleeping 0x00000334 #define ASIZ_task_semsleeping 0x00000004 -#define AOFF_task_thread 0x00000340 +#define AOFF_task_thread 0x00000338 #define ASIZ_task_thread 0x00000380 -#define AOFF_task_fs 0x000006c0 +#define AOFF_task_fs 0x000006b8 #define ASIZ_task_fs 0x00000004 -#define AOFF_task_files 0x000006c4 +#define AOFF_task_files 0x000006bc #define ASIZ_task_files 0x00000004 -#define AOFF_task_sigmask_lock 0x000006c8 +#define AOFF_task_sigmask_lock 0x000006c0 #define ASIZ_task_sigmask_lock 0x00000008 -#define AOFF_task_sig 0x000006d0 +#define AOFF_task_sig 0x000006c8 #define ASIZ_task_sig 0x00000004 -#define AOFF_task_signal 0x000006d4 +#define AOFF_task_signal 0x000006cc #define ASIZ_task_signal 0x00000008 -#define AOFF_task_blocked 0x000006dc +#define AOFF_task_blocked 0x000006d4 #define ASIZ_task_blocked 0x00000008 -#define AOFF_task_sigqueue 0x000006e4 +#define AOFF_task_sigqueue 0x000006dc #define ASIZ_task_sigqueue 0x00000004 -#define AOFF_task_sigqueue_tail 0x000006e8 +#define AOFF_task_sigqueue_tail 0x000006e0 #define ASIZ_task_sigqueue_tail 0x00000004 -#define AOFF_task_sas_ss_sp 0x000006ec +#define AOFF_task_sas_ss_sp 0x000006e4 #define ASIZ_task_sas_ss_sp 0x00000004 -#define AOFF_task_sas_ss_size 0x000006f0 +#define AOFF_task_sas_ss_size 0x000006e8 #define ASIZ_task_sas_ss_size 0x00000004 -#define AOFF_task_parent_exec_id 0x000006f4 +#define AOFF_task_parent_exec_id 0x000006ec #define ASIZ_task_parent_exec_id 0x00000004 -#define AOFF_task_self_exec_id 0x000006f8 +#define AOFF_task_self_exec_id 0x000006f0 #define ASIZ_task_self_exec_id 0x00000004 -#define AOFF_task_alloc_lock 0x000006fc +#define AOFF_task_alloc_lock 0x000006f4 #define ASIZ_task_alloc_lock 0x00000008 #define AOFF_mm_mmap 0x00000000 #define ASIZ_mm_mmap 0x00000004 @@ -482,48 +482,48 @@ #define AOFF_mm_map_count 0x00000018 #define ASIZ_mm_map_count 0x00000004 #define AOFF_mm_mmap_sem 0x0000001c -#define ASIZ_mm_mmap_sem 0x00000024 -#define AOFF_mm_page_table_lock 0x00000040 +#define ASIZ_mm_mmap_sem 0x00000018 +#define AOFF_mm_page_table_lock 0x00000034 #define ASIZ_mm_page_table_lock 0x00000008 -#define AOFF_mm_context 0x00000048 +#define AOFF_mm_context 0x0000003c #define ASIZ_mm_context 0x00000004 -#define AOFF_mm_start_code 0x0000004c +#define AOFF_mm_start_code 0x00000040 #define ASIZ_mm_start_code 0x00000004 -#define AOFF_mm_end_code 0x00000050 +#define AOFF_mm_end_code 0x00000044 #define ASIZ_mm_end_code 0x00000004 -#define AOFF_mm_start_data 0x00000054 +#define AOFF_mm_start_data 0x00000048 #define ASIZ_mm_start_data 0x00000004 -#define AOFF_mm_end_data 0x00000058 +#define AOFF_mm_end_data 0x0000004c #define ASIZ_mm_end_data 0x00000004 -#define AOFF_mm_start_brk 0x0000005c +#define AOFF_mm_start_brk 0x00000050 #define ASIZ_mm_start_brk 0x00000004 -#define AOFF_mm_brk 0x00000060 +#define AOFF_mm_brk 0x00000054 #define ASIZ_mm_brk 0x00000004 -#define AOFF_mm_start_stack 0x00000064 +#define AOFF_mm_start_stack 0x00000058 #define ASIZ_mm_start_stack 0x00000004 -#define AOFF_mm_arg_start 0x00000068 +#define AOFF_mm_arg_start 0x0000005c #define ASIZ_mm_arg_start 0x00000004 -#define AOFF_mm_arg_end 0x0000006c +#define AOFF_mm_arg_end 0x00000060 #define ASIZ_mm_arg_end 0x00000004 -#define AOFF_mm_env_start 0x00000070 +#define AOFF_mm_env_start 0x00000064 #define ASIZ_mm_env_start 0x00000004 -#define AOFF_mm_env_end 0x00000074 +#define AOFF_mm_env_end 0x00000068 #define ASIZ_mm_env_end 0x00000004 -#define AOFF_mm_rss 0x00000078 +#define AOFF_mm_rss 0x0000006c #define ASIZ_mm_rss 0x00000004 -#define AOFF_mm_total_vm 0x0000007c +#define AOFF_mm_total_vm 0x00000070 #define ASIZ_mm_total_vm 0x00000004 -#define AOFF_mm_locked_vm 0x00000080 +#define AOFF_mm_locked_vm 0x00000074 #define ASIZ_mm_locked_vm 0x00000004 -#define AOFF_mm_def_flags 0x00000084 +#define AOFF_mm_def_flags 0x00000078 #define ASIZ_mm_def_flags 0x00000004 -#define AOFF_mm_cpu_vm_mask 0x00000088 +#define AOFF_mm_cpu_vm_mask 0x0000007c #define ASIZ_mm_cpu_vm_mask 0x00000004 -#define AOFF_mm_swap_cnt 0x0000008c +#define AOFF_mm_swap_cnt 0x00000080 #define ASIZ_mm_swap_cnt 0x00000004 -#define AOFF_mm_swap_address 0x00000090 +#define AOFF_mm_swap_address 0x00000084 #define ASIZ_mm_swap_address 0x00000004 -#define AOFF_mm_segments 0x00000094 +#define AOFF_mm_segments 0x00000088 #define ASIZ_mm_segments 0x00000004 #define AOFF_thread_uwinmask 0x00000000 #define ASIZ_thread_uwinmask 0x00000004 diff --git a/include/asm-sparc/elf.h b/include/asm-sparc/elf.h index fbeaebf2ea37..436d1a9ad56b 100644 --- a/include/asm-sparc/elf.h +++ b/include/asm-sparc/elf.h @@ -1,4 +1,4 @@ -/* $Id: elf.h,v 1.21 2000/04/14 09:59:04 davem Exp $ */ +/* $Id: elf.h,v 1.22 2000/07/12 01:27:08 davem Exp $ */ #ifndef __ASMSPARC_ELF_H #define __ASMSPARC_ELF_H diff --git a/include/asm-sparc64/asm_offsets.h b/include/asm-sparc64/asm_offsets.h index 4218148633ad..e191ef259b9b 100644 --- a/include/asm-sparc64/asm_offsets.h +++ b/include/asm-sparc64/asm_offsets.h @@ -85,114 +85,114 @@ #define AOFF_task_pidhash_pprev 0x000000f8 #define ASIZ_task_pidhash_pprev 0x00000008 #define AOFF_task_wait_chldexit 0x00000100 -#define ASIZ_task_wait_chldexit 0x00000028 -#define AOFF_task_vfork_sem 0x00000128 +#define ASIZ_task_wait_chldexit 0x00000018 +#define AOFF_task_vfork_sem 0x00000118 #define ASIZ_task_vfork_sem 0x00000008 -#define AOFF_task_rt_priority 0x00000130 +#define AOFF_task_rt_priority 0x00000120 #define ASIZ_task_rt_priority 0x00000008 -#define AOFF_task_it_real_value 0x00000138 +#define AOFF_task_it_real_value 0x00000128 #define ASIZ_task_it_real_value 0x00000008 -#define AOFF_task_it_prof_value 0x00000140 +#define AOFF_task_it_prof_value 0x00000130 #define ASIZ_task_it_prof_value 0x00000008 -#define AOFF_task_it_virt_value 0x00000148 +#define AOFF_task_it_virt_value 0x00000138 #define ASIZ_task_it_virt_value 0x00000008 -#define AOFF_task_it_real_incr 0x00000150 +#define AOFF_task_it_real_incr 0x00000140 #define ASIZ_task_it_real_incr 0x00000008 -#define AOFF_task_it_prof_incr 0x00000158 +#define AOFF_task_it_prof_incr 0x00000148 #define ASIZ_task_it_prof_incr 0x00000008 -#define AOFF_task_it_virt_incr 0x00000160 +#define AOFF_task_it_virt_incr 0x00000150 #define ASIZ_task_it_virt_incr 0x00000008 -#define AOFF_task_real_timer 0x00000168 +#define AOFF_task_real_timer 0x00000158 #define ASIZ_task_real_timer 0x00000028 -#define AOFF_task_times 0x00000190 +#define AOFF_task_times 0x00000180 #define ASIZ_task_times 0x00000020 -#define AOFF_task_start_time 0x000001b0 +#define AOFF_task_start_time 0x000001a0 #define ASIZ_task_start_time 0x00000008 -#define AOFF_task_per_cpu_utime 0x000001b8 +#define AOFF_task_per_cpu_utime 0x000001a8 #define ASIZ_task_per_cpu_utime 0x00000008 -#define AOFF_task_min_flt 0x000001c8 +#define AOFF_task_min_flt 0x000001b8 #define ASIZ_task_min_flt 0x00000008 -#define AOFF_task_maj_flt 0x000001d0 +#define AOFF_task_maj_flt 0x000001c0 #define ASIZ_task_maj_flt 0x00000008 -#define AOFF_task_nswap 0x000001d8 +#define AOFF_task_nswap 0x000001c8 #define ASIZ_task_nswap 0x00000008 -#define AOFF_task_cmin_flt 0x000001e0 +#define AOFF_task_cmin_flt 0x000001d0 #define ASIZ_task_cmin_flt 0x00000008 -#define AOFF_task_cmaj_flt 0x000001e8 +#define AOFF_task_cmaj_flt 0x000001d8 #define ASIZ_task_cmaj_flt 0x00000008 -#define AOFF_task_cnswap 0x000001f0 +#define AOFF_task_cnswap 0x000001e0 #define ASIZ_task_cnswap 0x00000008 -#define AOFF_task_uid 0x000001fc +#define AOFF_task_uid 0x000001ec #define ASIZ_task_uid 0x00000004 -#define AOFF_task_euid 0x00000200 +#define AOFF_task_euid 0x000001f0 #define ASIZ_task_euid 0x00000004 -#define AOFF_task_suid 0x00000204 +#define AOFF_task_suid 0x000001f4 #define ASIZ_task_suid 0x00000004 -#define AOFF_task_fsuid 0x00000208 +#define AOFF_task_fsuid 0x000001f8 #define ASIZ_task_fsuid 0x00000004 -#define AOFF_task_gid 0x0000020c +#define AOFF_task_gid 0x000001fc #define ASIZ_task_gid 0x00000004 -#define AOFF_task_egid 0x00000210 +#define AOFF_task_egid 0x00000200 #define ASIZ_task_egid 0x00000004 -#define AOFF_task_sgid 0x00000214 +#define AOFF_task_sgid 0x00000204 #define ASIZ_task_sgid 0x00000004 -#define AOFF_task_fsgid 0x00000218 +#define AOFF_task_fsgid 0x00000208 #define ASIZ_task_fsgid 0x00000004 -#define AOFF_task_ngroups 0x0000021c +#define AOFF_task_ngroups 0x0000020c #define ASIZ_task_ngroups 0x00000004 -#define AOFF_task_groups 0x00000220 +#define AOFF_task_groups 0x00000210 #define ASIZ_task_groups 0x00000080 -#define AOFF_task_cap_effective 0x000002a0 +#define AOFF_task_cap_effective 0x00000290 #define ASIZ_task_cap_effective 0x00000004 -#define AOFF_task_cap_inheritable 0x000002a4 +#define AOFF_task_cap_inheritable 0x00000294 #define ASIZ_task_cap_inheritable 0x00000004 -#define AOFF_task_cap_permitted 0x000002a8 +#define AOFF_task_cap_permitted 0x00000298 #define ASIZ_task_cap_permitted 0x00000004 -#define AOFF_task_user 0x000002b0 +#define AOFF_task_user 0x000002a0 #define ASIZ_task_user 0x00000008 -#define AOFF_task_rlim 0x000002b8 +#define AOFF_task_rlim 0x000002a8 #define ASIZ_task_rlim 0x000000a0 -#define AOFF_task_used_math 0x00000358 +#define AOFF_task_used_math 0x00000348 #define ASIZ_task_used_math 0x00000002 -#define AOFF_task_comm 0x0000035a +#define AOFF_task_comm 0x0000034a #define ASIZ_task_comm 0x00000010 -#define AOFF_task_link_count 0x0000036c +#define AOFF_task_link_count 0x0000035c #define ASIZ_task_link_count 0x00000004 -#define AOFF_task_tty 0x00000370 +#define AOFF_task_tty 0x00000360 #define ASIZ_task_tty 0x00000008 -#define AOFF_task_semundo 0x00000378 +#define AOFF_task_semundo 0x00000368 #define ASIZ_task_semundo 0x00000008 -#define AOFF_task_semsleeping 0x00000380 +#define AOFF_task_semsleeping 0x00000370 #define ASIZ_task_semsleeping 0x00000008 -#define AOFF_task_thread 0x00000390 +#define AOFF_task_thread 0x00000380 #define ASIZ_task_thread 0x00000450 -#define AOFF_task_fs 0x000007e0 +#define AOFF_task_fs 0x000007d0 #define ASIZ_task_fs 0x00000008 -#define AOFF_task_files 0x000007e8 +#define AOFF_task_files 0x000007d8 #define ASIZ_task_files 0x00000008 -#define AOFF_task_sigmask_lock 0x000007f0 +#define AOFF_task_sigmask_lock 0x000007e0 #define ASIZ_task_sigmask_lock 0x00000004 -#define AOFF_task_sig 0x000007f8 +#define AOFF_task_sig 0x000007e8 #define ASIZ_task_sig 0x00000008 -#define AOFF_task_signal 0x00000800 +#define AOFF_task_signal 0x000007f0 #define ASIZ_task_signal 0x00000008 -#define AOFF_task_blocked 0x00000808 +#define AOFF_task_blocked 0x000007f8 #define ASIZ_task_blocked 0x00000008 -#define AOFF_task_sigqueue 0x00000810 +#define AOFF_task_sigqueue 0x00000800 #define ASIZ_task_sigqueue 0x00000008 -#define AOFF_task_sigqueue_tail 0x00000818 +#define AOFF_task_sigqueue_tail 0x00000808 #define ASIZ_task_sigqueue_tail 0x00000008 -#define AOFF_task_sas_ss_sp 0x00000820 +#define AOFF_task_sas_ss_sp 0x00000810 #define ASIZ_task_sas_ss_sp 0x00000008 -#define AOFF_task_sas_ss_size 0x00000828 +#define AOFF_task_sas_ss_size 0x00000818 #define ASIZ_task_sas_ss_size 0x00000008 -#define AOFF_task_parent_exec_id 0x00000830 +#define AOFF_task_parent_exec_id 0x00000820 #define ASIZ_task_parent_exec_id 0x00000004 -#define AOFF_task_self_exec_id 0x00000834 +#define AOFF_task_self_exec_id 0x00000824 #define ASIZ_task_self_exec_id 0x00000004 -#define AOFF_task_alloc_lock 0x00000838 +#define AOFF_task_alloc_lock 0x00000828 #define ASIZ_task_alloc_lock 0x00000004 -#define ASIZ_task 0x00000840 +#define ASIZ_task 0x00000830 #define AOFF_mm_mmap 0x00000000 #define ASIZ_mm_mmap 0x00000008 #define AOFF_mm_mmap_avl 0x00000008 @@ -208,50 +208,50 @@ #define AOFF_mm_map_count 0x00000028 #define ASIZ_mm_map_count 0x00000004 #define AOFF_mm_mmap_sem 0x00000030 -#define ASIZ_mm_mmap_sem 0x00000038 -#define AOFF_mm_page_table_lock 0x00000068 +#define ASIZ_mm_mmap_sem 0x00000020 +#define AOFF_mm_page_table_lock 0x00000050 #define ASIZ_mm_page_table_lock 0x00000004 -#define AOFF_mm_context 0x00000070 +#define AOFF_mm_context 0x00000058 #define ASIZ_mm_context 0x00000008 -#define AOFF_mm_start_code 0x00000078 +#define AOFF_mm_start_code 0x00000060 #define ASIZ_mm_start_code 0x00000008 -#define AOFF_mm_end_code 0x00000080 +#define AOFF_mm_end_code 0x00000068 #define ASIZ_mm_end_code 0x00000008 -#define AOFF_mm_start_data 0x00000088 +#define AOFF_mm_start_data 0x00000070 #define ASIZ_mm_start_data 0x00000008 -#define AOFF_mm_end_data 0x00000090 +#define AOFF_mm_end_data 0x00000078 #define ASIZ_mm_end_data 0x00000008 -#define AOFF_mm_start_brk 0x00000098 +#define AOFF_mm_start_brk 0x00000080 #define ASIZ_mm_start_brk 0x00000008 -#define AOFF_mm_brk 0x000000a0 +#define AOFF_mm_brk 0x00000088 #define ASIZ_mm_brk 0x00000008 -#define AOFF_mm_start_stack 0x000000a8 +#define AOFF_mm_start_stack 0x00000090 #define ASIZ_mm_start_stack 0x00000008 -#define AOFF_mm_arg_start 0x000000b0 +#define AOFF_mm_arg_start 0x00000098 #define ASIZ_mm_arg_start 0x00000008 -#define AOFF_mm_arg_end 0x000000b8 +#define AOFF_mm_arg_end 0x000000a0 #define ASIZ_mm_arg_end 0x00000008 -#define AOFF_mm_env_start 0x000000c0 +#define AOFF_mm_env_start 0x000000a8 #define ASIZ_mm_env_start 0x00000008 -#define AOFF_mm_env_end 0x000000c8 +#define AOFF_mm_env_end 0x000000b0 #define ASIZ_mm_env_end 0x00000008 -#define AOFF_mm_rss 0x000000d0 +#define AOFF_mm_rss 0x000000b8 #define ASIZ_mm_rss 0x00000008 -#define AOFF_mm_total_vm 0x000000d8 +#define AOFF_mm_total_vm 0x000000c0 #define ASIZ_mm_total_vm 0x00000008 -#define AOFF_mm_locked_vm 0x000000e0 +#define AOFF_mm_locked_vm 0x000000c8 #define ASIZ_mm_locked_vm 0x00000008 -#define AOFF_mm_def_flags 0x000000e8 +#define AOFF_mm_def_flags 0x000000d0 #define ASIZ_mm_def_flags 0x00000008 -#define AOFF_mm_cpu_vm_mask 0x000000f0 +#define AOFF_mm_cpu_vm_mask 0x000000d8 #define ASIZ_mm_cpu_vm_mask 0x00000008 -#define AOFF_mm_swap_cnt 0x000000f8 +#define AOFF_mm_swap_cnt 0x000000e0 #define ASIZ_mm_swap_cnt 0x00000008 -#define AOFF_mm_swap_address 0x00000100 +#define AOFF_mm_swap_address 0x000000e8 #define ASIZ_mm_swap_address 0x00000008 -#define AOFF_mm_segments 0x00000108 +#define AOFF_mm_segments 0x000000f0 #define ASIZ_mm_segments 0x00000008 -#define ASIZ_mm 0x00000110 +#define ASIZ_mm 0x000000f8 #define AOFF_thread_ksp 0x00000000 #define ASIZ_thread_ksp 0x00000008 #define AOFF_thread_wstate 0x00000008 @@ -379,114 +379,114 @@ #define AOFF_task_pidhash_pprev 0x000000f8 #define ASIZ_task_pidhash_pprev 0x00000008 #define AOFF_task_wait_chldexit 0x00000100 -#define ASIZ_task_wait_chldexit 0x00000028 -#define AOFF_task_vfork_sem 0x00000128 +#define ASIZ_task_wait_chldexit 0x00000018 +#define AOFF_task_vfork_sem 0x00000118 #define ASIZ_task_vfork_sem 0x00000008 -#define AOFF_task_rt_priority 0x00000130 +#define AOFF_task_rt_priority 0x00000120 #define ASIZ_task_rt_priority 0x00000008 -#define AOFF_task_it_real_value 0x00000138 +#define AOFF_task_it_real_value 0x00000128 #define ASIZ_task_it_real_value 0x00000008 -#define AOFF_task_it_prof_value 0x00000140 +#define AOFF_task_it_prof_value 0x00000130 #define ASIZ_task_it_prof_value 0x00000008 -#define AOFF_task_it_virt_value 0x00000148 +#define AOFF_task_it_virt_value 0x00000138 #define ASIZ_task_it_virt_value 0x00000008 -#define AOFF_task_it_real_incr 0x00000150 +#define AOFF_task_it_real_incr 0x00000140 #define ASIZ_task_it_real_incr 0x00000008 -#define AOFF_task_it_prof_incr 0x00000158 +#define AOFF_task_it_prof_incr 0x00000148 #define ASIZ_task_it_prof_incr 0x00000008 -#define AOFF_task_it_virt_incr 0x00000160 +#define AOFF_task_it_virt_incr 0x00000150 #define ASIZ_task_it_virt_incr 0x00000008 -#define AOFF_task_real_timer 0x00000168 +#define AOFF_task_real_timer 0x00000158 #define ASIZ_task_real_timer 0x00000028 -#define AOFF_task_times 0x00000190 +#define AOFF_task_times 0x00000180 #define ASIZ_task_times 0x00000020 -#define AOFF_task_start_time 0x000001b0 +#define AOFF_task_start_time 0x000001a0 #define ASIZ_task_start_time 0x00000008 -#define AOFF_task_per_cpu_utime 0x000001b8 +#define AOFF_task_per_cpu_utime 0x000001a8 #define ASIZ_task_per_cpu_utime 0x00000100 -#define AOFF_task_min_flt 0x000003b8 +#define AOFF_task_min_flt 0x000003a8 #define ASIZ_task_min_flt 0x00000008 -#define AOFF_task_maj_flt 0x000003c0 +#define AOFF_task_maj_flt 0x000003b0 #define ASIZ_task_maj_flt 0x00000008 -#define AOFF_task_nswap 0x000003c8 +#define AOFF_task_nswap 0x000003b8 #define ASIZ_task_nswap 0x00000008 -#define AOFF_task_cmin_flt 0x000003d0 +#define AOFF_task_cmin_flt 0x000003c0 #define ASIZ_task_cmin_flt 0x00000008 -#define AOFF_task_cmaj_flt 0x000003d8 +#define AOFF_task_cmaj_flt 0x000003c8 #define ASIZ_task_cmaj_flt 0x00000008 -#define AOFF_task_cnswap 0x000003e0 +#define AOFF_task_cnswap 0x000003d0 #define ASIZ_task_cnswap 0x00000008 -#define AOFF_task_uid 0x000003ec +#define AOFF_task_uid 0x000003dc #define ASIZ_task_uid 0x00000004 -#define AOFF_task_euid 0x000003f0 +#define AOFF_task_euid 0x000003e0 #define ASIZ_task_euid 0x00000004 -#define AOFF_task_suid 0x000003f4 +#define AOFF_task_suid 0x000003e4 #define ASIZ_task_suid 0x00000004 -#define AOFF_task_fsuid 0x000003f8 +#define AOFF_task_fsuid 0x000003e8 #define ASIZ_task_fsuid 0x00000004 -#define AOFF_task_gid 0x000003fc +#define AOFF_task_gid 0x000003ec #define ASIZ_task_gid 0x00000004 -#define AOFF_task_egid 0x00000400 +#define AOFF_task_egid 0x000003f0 #define ASIZ_task_egid 0x00000004 -#define AOFF_task_sgid 0x00000404 +#define AOFF_task_sgid 0x000003f4 #define ASIZ_task_sgid 0x00000004 -#define AOFF_task_fsgid 0x00000408 +#define AOFF_task_fsgid 0x000003f8 #define ASIZ_task_fsgid 0x00000004 -#define AOFF_task_ngroups 0x0000040c +#define AOFF_task_ngroups 0x000003fc #define ASIZ_task_ngroups 0x00000004 -#define AOFF_task_groups 0x00000410 +#define AOFF_task_groups 0x00000400 #define ASIZ_task_groups 0x00000080 -#define AOFF_task_cap_effective 0x00000490 +#define AOFF_task_cap_effective 0x00000480 #define ASIZ_task_cap_effective 0x00000004 -#define AOFF_task_cap_inheritable 0x00000494 +#define AOFF_task_cap_inheritable 0x00000484 #define ASIZ_task_cap_inheritable 0x00000004 -#define AOFF_task_cap_permitted 0x00000498 +#define AOFF_task_cap_permitted 0x00000488 #define ASIZ_task_cap_permitted 0x00000004 -#define AOFF_task_user 0x000004a0 +#define AOFF_task_user 0x00000490 #define ASIZ_task_user 0x00000008 -#define AOFF_task_rlim 0x000004a8 +#define AOFF_task_rlim 0x00000498 #define ASIZ_task_rlim 0x000000a0 -#define AOFF_task_used_math 0x00000548 +#define AOFF_task_used_math 0x00000538 #define ASIZ_task_used_math 0x00000002 -#define AOFF_task_comm 0x0000054a +#define AOFF_task_comm 0x0000053a #define ASIZ_task_comm 0x00000010 -#define AOFF_task_link_count 0x0000055c +#define AOFF_task_link_count 0x0000054c #define ASIZ_task_link_count 0x00000004 -#define AOFF_task_tty 0x00000560 +#define AOFF_task_tty 0x00000550 #define ASIZ_task_tty 0x00000008 -#define AOFF_task_semundo 0x00000568 +#define AOFF_task_semundo 0x00000558 #define ASIZ_task_semundo 0x00000008 -#define AOFF_task_semsleeping 0x00000570 +#define AOFF_task_semsleeping 0x00000560 #define ASIZ_task_semsleeping 0x00000008 -#define AOFF_task_thread 0x00000580 +#define AOFF_task_thread 0x00000570 #define ASIZ_task_thread 0x00000450 -#define AOFF_task_fs 0x000009d0 +#define AOFF_task_fs 0x000009c0 #define ASIZ_task_fs 0x00000008 -#define AOFF_task_files 0x000009d8 +#define AOFF_task_files 0x000009c8 #define ASIZ_task_files 0x00000008 -#define AOFF_task_sigmask_lock 0x000009e0 +#define AOFF_task_sigmask_lock 0x000009d0 #define ASIZ_task_sigmask_lock 0x00000001 -#define AOFF_task_sig 0x000009e8 +#define AOFF_task_sig 0x000009d8 #define ASIZ_task_sig 0x00000008 -#define AOFF_task_signal 0x000009f0 +#define AOFF_task_signal 0x000009e0 #define ASIZ_task_signal 0x00000008 -#define AOFF_task_blocked 0x000009f8 +#define AOFF_task_blocked 0x000009e8 #define ASIZ_task_blocked 0x00000008 -#define AOFF_task_sigqueue 0x00000a00 +#define AOFF_task_sigqueue 0x000009f0 #define ASIZ_task_sigqueue 0x00000008 -#define AOFF_task_sigqueue_tail 0x00000a08 +#define AOFF_task_sigqueue_tail 0x000009f8 #define ASIZ_task_sigqueue_tail 0x00000008 -#define AOFF_task_sas_ss_sp 0x00000a10 +#define AOFF_task_sas_ss_sp 0x00000a00 #define ASIZ_task_sas_ss_sp 0x00000008 -#define AOFF_task_sas_ss_size 0x00000a18 +#define AOFF_task_sas_ss_size 0x00000a08 #define ASIZ_task_sas_ss_size 0x00000008 -#define AOFF_task_parent_exec_id 0x00000a20 +#define AOFF_task_parent_exec_id 0x00000a10 #define ASIZ_task_parent_exec_id 0x00000004 -#define AOFF_task_self_exec_id 0x00000a24 +#define AOFF_task_self_exec_id 0x00000a14 #define ASIZ_task_self_exec_id 0x00000004 -#define AOFF_task_alloc_lock 0x00000a28 +#define AOFF_task_alloc_lock 0x00000a18 #define ASIZ_task_alloc_lock 0x00000001 -#define ASIZ_task 0x00000a30 +#define ASIZ_task 0x00000a20 #define AOFF_mm_mmap 0x00000000 #define ASIZ_mm_mmap 0x00000008 #define AOFF_mm_mmap_avl 0x00000008 @@ -502,50 +502,50 @@ #define AOFF_mm_map_count 0x00000028 #define ASIZ_mm_map_count 0x00000004 #define AOFF_mm_mmap_sem 0x00000030 -#define ASIZ_mm_mmap_sem 0x00000038 -#define AOFF_mm_page_table_lock 0x00000068 +#define ASIZ_mm_mmap_sem 0x00000020 +#define AOFF_mm_page_table_lock 0x00000050 #define ASIZ_mm_page_table_lock 0x00000001 -#define AOFF_mm_context 0x00000070 +#define AOFF_mm_context 0x00000058 #define ASIZ_mm_context 0x00000008 -#define AOFF_mm_start_code 0x00000078 +#define AOFF_mm_start_code 0x00000060 #define ASIZ_mm_start_code 0x00000008 -#define AOFF_mm_end_code 0x00000080 +#define AOFF_mm_end_code 0x00000068 #define ASIZ_mm_end_code 0x00000008 -#define AOFF_mm_start_data 0x00000088 +#define AOFF_mm_start_data 0x00000070 #define ASIZ_mm_start_data 0x00000008 -#define AOFF_mm_end_data 0x00000090 +#define AOFF_mm_end_data 0x00000078 #define ASIZ_mm_end_data 0x00000008 -#define AOFF_mm_start_brk 0x00000098 +#define AOFF_mm_start_brk 0x00000080 #define ASIZ_mm_start_brk 0x00000008 -#define AOFF_mm_brk 0x000000a0 +#define AOFF_mm_brk 0x00000088 #define ASIZ_mm_brk 0x00000008 -#define AOFF_mm_start_stack 0x000000a8 +#define AOFF_mm_start_stack 0x00000090 #define ASIZ_mm_start_stack 0x00000008 -#define AOFF_mm_arg_start 0x000000b0 +#define AOFF_mm_arg_start 0x00000098 #define ASIZ_mm_arg_start 0x00000008 -#define AOFF_mm_arg_end 0x000000b8 +#define AOFF_mm_arg_end 0x000000a0 #define ASIZ_mm_arg_end 0x00000008 -#define AOFF_mm_env_start 0x000000c0 +#define AOFF_mm_env_start 0x000000a8 #define ASIZ_mm_env_start 0x00000008 -#define AOFF_mm_env_end 0x000000c8 +#define AOFF_mm_env_end 0x000000b0 #define ASIZ_mm_env_end 0x00000008 -#define AOFF_mm_rss 0x000000d0 +#define AOFF_mm_rss 0x000000b8 #define ASIZ_mm_rss 0x00000008 -#define AOFF_mm_total_vm 0x000000d8 +#define AOFF_mm_total_vm 0x000000c0 #define ASIZ_mm_total_vm 0x00000008 -#define AOFF_mm_locked_vm 0x000000e0 +#define AOFF_mm_locked_vm 0x000000c8 #define ASIZ_mm_locked_vm 0x00000008 -#define AOFF_mm_def_flags 0x000000e8 +#define AOFF_mm_def_flags 0x000000d0 #define ASIZ_mm_def_flags 0x00000008 -#define AOFF_mm_cpu_vm_mask 0x000000f0 +#define AOFF_mm_cpu_vm_mask 0x000000d8 #define ASIZ_mm_cpu_vm_mask 0x00000008 -#define AOFF_mm_swap_cnt 0x000000f8 +#define AOFF_mm_swap_cnt 0x000000e0 #define ASIZ_mm_swap_cnt 0x00000008 -#define AOFF_mm_swap_address 0x00000100 +#define AOFF_mm_swap_address 0x000000e8 #define ASIZ_mm_swap_address 0x00000008 -#define AOFF_mm_segments 0x00000108 +#define AOFF_mm_segments 0x000000f0 #define ASIZ_mm_segments 0x00000008 -#define ASIZ_mm 0x00000110 +#define ASIZ_mm 0x000000f8 #define AOFF_thread_ksp 0x00000000 #define ASIZ_thread_ksp 0x00000008 #define AOFF_thread_wstate 0x00000008 @@ -671,114 +671,114 @@ #define AOFF_task_pidhash_pprev 0x000000f8 #define ASIZ_task_pidhash_pprev 0x00000008 #define AOFF_task_wait_chldexit 0x00000100 -#define ASIZ_task_wait_chldexit 0x00000030 -#define AOFF_task_vfork_sem 0x00000130 +#define ASIZ_task_wait_chldexit 0x00000020 +#define AOFF_task_vfork_sem 0x00000120 #define ASIZ_task_vfork_sem 0x00000008 -#define AOFF_task_rt_priority 0x00000138 +#define AOFF_task_rt_priority 0x00000128 #define ASIZ_task_rt_priority 0x00000008 -#define AOFF_task_it_real_value 0x00000140 +#define AOFF_task_it_real_value 0x00000130 #define ASIZ_task_it_real_value 0x00000008 -#define AOFF_task_it_prof_value 0x00000148 +#define AOFF_task_it_prof_value 0x00000138 #define ASIZ_task_it_prof_value 0x00000008 -#define AOFF_task_it_virt_value 0x00000150 +#define AOFF_task_it_virt_value 0x00000140 #define ASIZ_task_it_virt_value 0x00000008 -#define AOFF_task_it_real_incr 0x00000158 +#define AOFF_task_it_real_incr 0x00000148 #define ASIZ_task_it_real_incr 0x00000008 -#define AOFF_task_it_prof_incr 0x00000160 +#define AOFF_task_it_prof_incr 0x00000150 #define ASIZ_task_it_prof_incr 0x00000008 -#define AOFF_task_it_virt_incr 0x00000168 +#define AOFF_task_it_virt_incr 0x00000158 #define ASIZ_task_it_virt_incr 0x00000008 -#define AOFF_task_real_timer 0x00000170 +#define AOFF_task_real_timer 0x00000160 #define ASIZ_task_real_timer 0x00000028 -#define AOFF_task_times 0x00000198 +#define AOFF_task_times 0x00000188 #define ASIZ_task_times 0x00000020 -#define AOFF_task_start_time 0x000001b8 +#define AOFF_task_start_time 0x000001a8 #define ASIZ_task_start_time 0x00000008 -#define AOFF_task_per_cpu_utime 0x000001c0 +#define AOFF_task_per_cpu_utime 0x000001b0 #define ASIZ_task_per_cpu_utime 0x00000100 -#define AOFF_task_min_flt 0x000003c0 +#define AOFF_task_min_flt 0x000003b0 #define ASIZ_task_min_flt 0x00000008 -#define AOFF_task_maj_flt 0x000003c8 +#define AOFF_task_maj_flt 0x000003b8 #define ASIZ_task_maj_flt 0x00000008 -#define AOFF_task_nswap 0x000003d0 +#define AOFF_task_nswap 0x000003c0 #define ASIZ_task_nswap 0x00000008 -#define AOFF_task_cmin_flt 0x000003d8 +#define AOFF_task_cmin_flt 0x000003c8 #define ASIZ_task_cmin_flt 0x00000008 -#define AOFF_task_cmaj_flt 0x000003e0 +#define AOFF_task_cmaj_flt 0x000003d0 #define ASIZ_task_cmaj_flt 0x00000008 -#define AOFF_task_cnswap 0x000003e8 +#define AOFF_task_cnswap 0x000003d8 #define ASIZ_task_cnswap 0x00000008 -#define AOFF_task_uid 0x000003f4 +#define AOFF_task_uid 0x000003e4 #define ASIZ_task_uid 0x00000004 -#define AOFF_task_euid 0x000003f8 +#define AOFF_task_euid 0x000003e8 #define ASIZ_task_euid 0x00000004 -#define AOFF_task_suid 0x000003fc +#define AOFF_task_suid 0x000003ec #define ASIZ_task_suid 0x00000004 -#define AOFF_task_fsuid 0x00000400 +#define AOFF_task_fsuid 0x000003f0 #define ASIZ_task_fsuid 0x00000004 -#define AOFF_task_gid 0x00000404 +#define AOFF_task_gid 0x000003f4 #define ASIZ_task_gid 0x00000004 -#define AOFF_task_egid 0x00000408 +#define AOFF_task_egid 0x000003f8 #define ASIZ_task_egid 0x00000004 -#define AOFF_task_sgid 0x0000040c +#define AOFF_task_sgid 0x000003fc #define ASIZ_task_sgid 0x00000004 -#define AOFF_task_fsgid 0x00000410 +#define AOFF_task_fsgid 0x00000400 #define ASIZ_task_fsgid 0x00000004 -#define AOFF_task_ngroups 0x00000414 +#define AOFF_task_ngroups 0x00000404 #define ASIZ_task_ngroups 0x00000004 -#define AOFF_task_groups 0x00000418 +#define AOFF_task_groups 0x00000408 #define ASIZ_task_groups 0x00000080 -#define AOFF_task_cap_effective 0x00000498 +#define AOFF_task_cap_effective 0x00000488 #define ASIZ_task_cap_effective 0x00000004 -#define AOFF_task_cap_inheritable 0x0000049c +#define AOFF_task_cap_inheritable 0x0000048c #define ASIZ_task_cap_inheritable 0x00000004 -#define AOFF_task_cap_permitted 0x000004a0 +#define AOFF_task_cap_permitted 0x00000490 #define ASIZ_task_cap_permitted 0x00000004 -#define AOFF_task_user 0x000004a8 +#define AOFF_task_user 0x00000498 #define ASIZ_task_user 0x00000008 -#define AOFF_task_rlim 0x000004b0 +#define AOFF_task_rlim 0x000004a0 #define ASIZ_task_rlim 0x000000a0 -#define AOFF_task_used_math 0x00000550 +#define AOFF_task_used_math 0x00000540 #define ASIZ_task_used_math 0x00000002 -#define AOFF_task_comm 0x00000552 +#define AOFF_task_comm 0x00000542 #define ASIZ_task_comm 0x00000010 -#define AOFF_task_link_count 0x00000564 +#define AOFF_task_link_count 0x00000554 #define ASIZ_task_link_count 0x00000004 -#define AOFF_task_tty 0x00000568 +#define AOFF_task_tty 0x00000558 #define ASIZ_task_tty 0x00000008 -#define AOFF_task_semundo 0x00000570 +#define AOFF_task_semundo 0x00000560 #define ASIZ_task_semundo 0x00000008 -#define AOFF_task_semsleeping 0x00000578 +#define AOFF_task_semsleeping 0x00000568 #define ASIZ_task_semsleeping 0x00000008 -#define AOFF_task_thread 0x00000580 +#define AOFF_task_thread 0x00000570 #define ASIZ_task_thread 0x00000450 -#define AOFF_task_fs 0x000009d0 +#define AOFF_task_fs 0x000009c0 #define ASIZ_task_fs 0x00000008 -#define AOFF_task_files 0x000009d8 +#define AOFF_task_files 0x000009c8 #define ASIZ_task_files 0x00000008 -#define AOFF_task_sigmask_lock 0x000009e0 +#define AOFF_task_sigmask_lock 0x000009d0 #define ASIZ_task_sigmask_lock 0x0000000c -#define AOFF_task_sig 0x000009f0 +#define AOFF_task_sig 0x000009e0 #define ASIZ_task_sig 0x00000008 -#define AOFF_task_signal 0x000009f8 +#define AOFF_task_signal 0x000009e8 #define ASIZ_task_signal 0x00000008 -#define AOFF_task_blocked 0x00000a00 +#define AOFF_task_blocked 0x000009f0 #define ASIZ_task_blocked 0x00000008 -#define AOFF_task_sigqueue 0x00000a08 +#define AOFF_task_sigqueue 0x000009f8 #define ASIZ_task_sigqueue 0x00000008 -#define AOFF_task_sigqueue_tail 0x00000a10 +#define AOFF_task_sigqueue_tail 0x00000a00 #define ASIZ_task_sigqueue_tail 0x00000008 -#define AOFF_task_sas_ss_sp 0x00000a18 +#define AOFF_task_sas_ss_sp 0x00000a08 #define ASIZ_task_sas_ss_sp 0x00000008 -#define AOFF_task_sas_ss_size 0x00000a20 +#define AOFF_task_sas_ss_size 0x00000a10 #define ASIZ_task_sas_ss_size 0x00000008 -#define AOFF_task_parent_exec_id 0x00000a28 +#define AOFF_task_parent_exec_id 0x00000a18 #define ASIZ_task_parent_exec_id 0x00000004 -#define AOFF_task_self_exec_id 0x00000a2c +#define AOFF_task_self_exec_id 0x00000a1c #define ASIZ_task_self_exec_id 0x00000004 -#define AOFF_task_alloc_lock 0x00000a30 +#define AOFF_task_alloc_lock 0x00000a20 #define ASIZ_task_alloc_lock 0x0000000c -#define ASIZ_task 0x00000a40 +#define ASIZ_task 0x00000a30 #define AOFF_mm_mmap 0x00000000 #define ASIZ_mm_mmap 0x00000008 #define AOFF_mm_mmap_avl 0x00000008 @@ -794,50 +794,50 @@ #define AOFF_mm_map_count 0x00000028 #define ASIZ_mm_map_count 0x00000004 #define AOFF_mm_mmap_sem 0x00000030 -#define ASIZ_mm_mmap_sem 0x00000040 -#define AOFF_mm_page_table_lock 0x00000070 +#define ASIZ_mm_mmap_sem 0x00000028 +#define AOFF_mm_page_table_lock 0x00000058 #define ASIZ_mm_page_table_lock 0x0000000c -#define AOFF_mm_context 0x00000080 +#define AOFF_mm_context 0x00000068 #define ASIZ_mm_context 0x00000008 -#define AOFF_mm_start_code 0x00000088 +#define AOFF_mm_start_code 0x00000070 #define ASIZ_mm_start_code 0x00000008 -#define AOFF_mm_end_code 0x00000090 +#define AOFF_mm_end_code 0x00000078 #define ASIZ_mm_end_code 0x00000008 -#define AOFF_mm_start_data 0x00000098 +#define AOFF_mm_start_data 0x00000080 #define ASIZ_mm_start_data 0x00000008 -#define AOFF_mm_end_data 0x000000a0 +#define AOFF_mm_end_data 0x00000088 #define ASIZ_mm_end_data 0x00000008 -#define AOFF_mm_start_brk 0x000000a8 +#define AOFF_mm_start_brk 0x00000090 #define ASIZ_mm_start_brk 0x00000008 -#define AOFF_mm_brk 0x000000b0 +#define AOFF_mm_brk 0x00000098 #define ASIZ_mm_brk 0x00000008 -#define AOFF_mm_start_stack 0x000000b8 +#define AOFF_mm_start_stack 0x000000a0 #define ASIZ_mm_start_stack 0x00000008 -#define AOFF_mm_arg_start 0x000000c0 +#define AOFF_mm_arg_start 0x000000a8 #define ASIZ_mm_arg_start 0x00000008 -#define AOFF_mm_arg_end 0x000000c8 +#define AOFF_mm_arg_end 0x000000b0 #define ASIZ_mm_arg_end 0x00000008 -#define AOFF_mm_env_start 0x000000d0 +#define AOFF_mm_env_start 0x000000b8 #define ASIZ_mm_env_start 0x00000008 -#define AOFF_mm_env_end 0x000000d8 +#define AOFF_mm_env_end 0x000000c0 #define ASIZ_mm_env_end 0x00000008 -#define AOFF_mm_rss 0x000000e0 +#define AOFF_mm_rss 0x000000c8 #define ASIZ_mm_rss 0x00000008 -#define AOFF_mm_total_vm 0x000000e8 +#define AOFF_mm_total_vm 0x000000d0 #define ASIZ_mm_total_vm 0x00000008 -#define AOFF_mm_locked_vm 0x000000f0 +#define AOFF_mm_locked_vm 0x000000d8 #define ASIZ_mm_locked_vm 0x00000008 -#define AOFF_mm_def_flags 0x000000f8 +#define AOFF_mm_def_flags 0x000000e0 #define ASIZ_mm_def_flags 0x00000008 -#define AOFF_mm_cpu_vm_mask 0x00000100 +#define AOFF_mm_cpu_vm_mask 0x000000e8 #define ASIZ_mm_cpu_vm_mask 0x00000008 -#define AOFF_mm_swap_cnt 0x00000108 +#define AOFF_mm_swap_cnt 0x000000f0 #define ASIZ_mm_swap_cnt 0x00000008 -#define AOFF_mm_swap_address 0x00000110 +#define AOFF_mm_swap_address 0x000000f8 #define ASIZ_mm_swap_address 0x00000008 -#define AOFF_mm_segments 0x00000118 +#define AOFF_mm_segments 0x00000100 #define ASIZ_mm_segments 0x00000008 -#define ASIZ_mm 0x00000120 +#define ASIZ_mm 0x00000108 #define AOFF_thread_ksp 0x00000000 #define ASIZ_thread_ksp 0x00000008 #define AOFF_thread_wstate 0x00000008 diff --git a/include/linux/poll.h b/include/linux/poll.h index bc0fcde22bc3..64b5df671fbb 100644 --- a/include/linux/poll.h +++ b/include/linux/poll.h @@ -38,22 +38,13 @@ extern inline void poll_wait(struct file * filp, wait_queue_head_t * wait_addres __pollwait(filp, wait_address, p); } -/* - * For the kernel fd_set we use a fixed set-size for allocation purposes. - * This set-size doesn't necessarily bear any relation to the size the user - * uses, but should preferably obviously be larger than any possible user - * size (NR_OPEN bits). - * - * We need 6 bitmaps (in/out/ex for both incoming and outgoing), and we - * allocate one page for all the bitmaps. Thus we have 8*PAGE_SIZE bits, - * to be divided by 6. And we'd better make sure we round to a full - * long-word (in fact, we'll round to 64 bytes). - */ - +static inline void poll_initwait(poll_table* pt) +{ + pt->error = 0; + pt->table = NULL; +} +extern void poll_freewait(poll_table* pt); -#define KFDS_64BLOCK ((PAGE_SIZE/(6*64))*64) -#define KFDS_NR (KFDS_64BLOCK*8 > NR_OPEN ? NR_OPEN : KFDS_64BLOCK*8) -typedef unsigned long kernel_fd_set[KFDS_NR/__NFDBITS]; /* * Scaleable version of the fd_set. diff --git a/kernel/ksyms.c b/kernel/ksyms.c index 63595484daa4..32e548315429 100644 --- a/kernel/ksyms.c +++ b/kernel/ksyms.c @@ -235,6 +235,7 @@ EXPORT_SYMBOL(vfs_rename); EXPORT_SYMBOL(vfs_statfs); EXPORT_SYMBOL(generic_read_dir); EXPORT_SYMBOL(__pollwait); +EXPORT_SYMBOL(poll_freewait); EXPORT_SYMBOL(ROOT_DEV); EXPORT_SYMBOL(__find_get_page); EXPORT_SYMBOL(__find_lock_page); diff --git a/mm/memory.c b/mm/memory.c index de7dc07f8c91..83f1586d4bfa 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -373,12 +373,12 @@ void zap_page_range(struct mm_struct *mm, unsigned long address, unsigned long s spin_unlock(&mm->page_table_lock); /* * Update rss for the mm_struct (not necessarily current->mm) + * Notice that rss is an unsigned long. */ - if (mm->rss > 0) { + if (mm->rss > freed) mm->rss -= freed; - if (mm->rss < 0) - mm->rss = 0; - } + else + mm->rss = 0; } diff --git a/net/core/netfilter.c b/net/core/netfilter.c index 7f9b9e82b6f8..b1f8a9fe8083 100644 --- a/net/core/netfilter.c +++ b/net/core/netfilter.c @@ -512,7 +512,6 @@ void nf_reinject(struct sk_buff *skb, struct nf_info *info, info->indev, info->outdev, &elem, info->okfn); } - br_read_unlock_bh(BR_NETPROTO_LOCK); switch (verdict) { case NF_ACCEPT: @@ -527,6 +526,7 @@ void nf_reinject(struct sk_buff *skb, struct nf_info *info, kfree_skb(skb); break; } + br_read_unlock_bh(BR_NETPROTO_LOCK); /* Release those devices we held, or Alexey will kill me. */ if (info->indev) dev_put(info->indev); diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 190551d79c09..01000f86237f 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c @@ -5,7 +5,7 @@ * Authors: * Pedro Roque * - * $Id: reassembly.c,v 1.18 2000/07/07 22:29:42 davem Exp $ + * $Id: reassembly.c,v 1.19 2000/07/11 22:35:24 davem Exp $ * * Based on: net/ipv4/ip_fragment.c * diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index bb6b3a291611..dc9f11aa7ddd 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c @@ -1751,11 +1751,12 @@ cbq_destroy(struct Qdisc* sch) static void cbq_put(struct Qdisc *sch, unsigned long arg) { - struct cbq_sched_data *q = (struct cbq_sched_data *)sch->data; struct cbq_class *cl = (struct cbq_class*)arg; if (--cl->refcnt == 0) { #ifdef CONFIG_NET_CLS_POLICE + struct cbq_sched_data *q = (struct cbq_sched_data *)sch->data; + spin_lock_bh(&sch->dev->queue_lock); if (q->rx_class == cl) q->rx_class = NULL;