TAKE - merge up to 2.5.4

[Steve Lord <lord@sgi.com>]

Makes kernel preemptable

Date:  Mon Feb 11 09:34:00 PST 2002
Workarea:  jen.americas.sgi.com:/src/lord/xfs-merge

The following file(s) were checked into:
  bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs


Modid:  2.5.x-xfs:slinx:111492a
linux/include/linux/err.h - 1.1
linux/Documentation/preempt-locking.txt - 1.1
linux/include/asm-sparc64/thread_info.h - 1.1
linux/net/sunrpc/svcauth.c - 1.4
linux/net/socket.c - 1.31
linux/mm/slab.c - 1.31
linux/mm/mremap.c - 1.27
linux/mm/mprotect.c - 1.22
linux/mm/filemap.c - 1.109
linux/kernel/time.c - 1.8
linux/kernel/sys.c - 1.27
linux/kernel/signal.c - 1.26
linux/kernel/sched.c - 1.58
linux/kernel/module.c - 1.26
linux/kernel/ksyms.c - 1.133
linux/kernel/fork.c - 1.48
linux/kernel/exit.c - 1.40
linux/include/net/sock.h - 1.28
linux/include/net/scm.h - 1.4
linux/include/net/neighbour.h - 1.8
linux/include/linux/vmalloc.h - 1.15
linux/include/linux/timex.h - 1.5
linux/include/linux/time.h - 1.6
linux/include/linux/swap.h - 1.53
linux/include/linux/sunrpc/xdr.h - 1.7
linux/include/linux/sunrpc/svc.h - 1.5
linux/include/linux/sound.h - 1.4
linux/include/linux/smp_lock.h - 1.5
linux/include/linux/smp.h - 1.10
linux/include/linux/smb_fs_i.h - 1.8
linux/include/linux/smb.h - 1.6
linux/include/linux/slab.h - 1.22
linux/include/linux/skbuff.h - 1.23
linux/include/linux/sched.h - 1.61
linux/include/linux/quotaops.h - 1.13
linux/include/linux/msdos_fs_i.h - 1.6
linux/include/linux/mm.h - 1.78
linux/include/linux/lp.h - 1.8
linux/include/linux/iso_fs_i.h - 1.5
linux/include/linux/inet.h - 1.4
linux/include/linux/in.h - 1.5
linux/include/linux/fs.h - 1.149
linux/include/linux/file.h - 1.14
linux/include/linux/capability.h - 1.11
linux/include/linux/ax25.h - 1.4
linux/include/linux/affs_fs_i.h - 1.6
linux/include/asm-sparc64/unistd.h - 1.17
linux/include/asm-sparc64/uaccess.h - 1.7
linux/include/asm-sparc64/ttable.h - 1.9
linux/include/asm-sparc64/system.h - 1.16
linux/include/asm-sparc64/spinlock.h - 1.11
linux/include/asm-sparc64/softirq.h - 1.10
linux/include/asm-sparc64/smplock.h - 1.6
linux/include/asm-sparc64/smp.h - 1.13
linux/include/asm-sparc64/ptrace.h - 1.3
linux/include/asm-sparc64/processor.h - 1.23
linux/include/asm-sparc64/pgtable.h - 1.30
linux/include/asm-sparc64/page.h - 1.13
linux/include/asm-sparc64/mmu_context.h - 1.16
linux/include/asm-sparc64/hardirq.h - 1.14
linux/include/asm-sparc64/fpumacro.h - 1.3
linux/include/asm-sparc64/elf.h - 1.12
linux/include/asm-sparc64/delay.h - 1.8
linux/include/asm-sparc64/current.h - 1.3
linux/include/asm-sparc64/checksum.h - 1.8
linux/include/asm-sparc64/a.out.h - 1.5
linux/include/asm-sparc/unistd.h - 1.15
linux/include/asm-sparc/siginfo.h - 1.9
linux/include/asm-sparc/checksum.h - 1.6
linux/include/asm-i386/uaccess.h - 1.15
linux/include/asm-i386/spinlock.h - 1.23
linux/include/asm-i386/softirq.h - 1.15
linux/include/asm-i386/smplock.h - 1.13
linux/include/asm-i386/processor.h - 1.32
linux/include/asm-i386/hardirq.h - 1.17
linux/fs/umsdos/rdir.c - 1.15
linux/fs/umsdos/namei.c - 1.13
linux/fs/umsdos/ioctl.c - 1.9
linux/fs/umsdos/inode.c - 1.23
linux/fs/umsdos/emd.c - 1.10
linux/fs/umsdos/dir.c - 1.19
linux/fs/ufs/truncate.c - 1.15
linux/fs/ufs/super.c - 1.26
linux/fs/ufs/namei.c - 1.13
linux/fs/ufs/inode.c - 1.21
linux/fs/ufs/ialloc.c - 1.13
linux/fs/ufs/file.c - 1.11
linux/fs/ufs/dir.c - 1.15
linux/fs/ufs/cylinder.c - 1.6
linux/fs/ufs/balloc.c - 1.13
linux/fs/stat.c - 1.23
linux/fs/smbfs/sock.c - 1.11
linux/fs/smbfs/ioctl.c - 1.9
linux/fs/smbfs/inode.c - 1.29
linux/fs/smbfs/file.c - 1.26
linux/fs/smbfs/dir.c - 1.17
linux/fs/smbfs/cache.c - 1.13
linux/fs/select.c - 1.19
linux/fs/readdir.c - 1.12
linux/fs/qnx4/namei.c - 1.12
linux/fs/qnx4/fsync.c - 1.9
linux/fs/qnx4/file.c - 1.10
linux/fs/qnx4/bitmap.c - 1.11
linux/fs/proc/root.c - 1.26
linux/fs/proc/proc_tty.c - 1.7
linux/fs/proc/proc_devtree.c - 1.8
linux/fs/proc/kmsg.c - 1.8
linux/fs/proc/inode.c - 1.18
linux/fs/proc/generic.c - 1.26
linux/fs/proc/base.c - 1.33
linux/fs/proc/array.c - 1.37
linux/fs/pipe.c - 1.26
linux/fs/nfsd/vfs.c - 1.44
linux/fs/nfsd/stats.c - 1.8
linux/fs/nfsd/nfsxdr.c - 1.14
linux/fs/nfsd/nfssvc.c - 1.18
linux/fs/nfsd/nfsproc.c - 1.21
linux/fs/nfsd/nfsfh.c - 1.34
linux/fs/nfsd/nfsctl.c - 1.25
linux/fs/nfsd/nfscache.c - 1.9
linux/fs/nfsd/nfs3xdr.c - 1.24
linux/fs/nfsd/nfs3proc.c - 1.11
linux/fs/nfsd/export.c - 1.25
linux/fs/nfs/symlink.c - 1.15
linux/fs/nfs/read.c - 1.30
linux/fs/nfs/proc.c - 1.12
linux/fs/nfs/nfsroot.c - 1.12
linux/fs/nfs/nfs3xdr.c - 1.8
linux/fs/nfs/nfs2xdr.c - 1.11
linux/fs/nfs/inode.c - 1.38
linux/fs/nfs/file.c - 1.29
linux/fs/nfs/dir.c - 1.33
linux/fs/ncpfs/symlink.c - 1.14
linux/fs/ncpfs/sock.c - 1.11
linux/fs/ncpfs/mmap.c - 1.16
linux/fs/ncpfs/ioctl.c - 1.16
linux/fs/ncpfs/inode.c - 1.26
linux/fs/ncpfs/file.c - 1.19
linux/fs/ncpfs/dir.c - 1.26
linux/fs/msdos/namei.c - 1.25
linux/fs/locks.c - 1.22
linux/fs/lockd/svcsubs.c - 1.9
linux/fs/lockd/svcshare.c - 1.5
linux/fs/lockd/svcproc.c - 1.9
linux/fs/lockd/svclock.c - 1.14
linux/fs/lockd/lockd_syms.c - 1.6
linux/fs/lockd/clntlock.c - 1.11
linux/fs/isofs/rock.c - 1.19
linux/fs/isofs/namei.c - 1.9
linux/fs/isofs/inode.c - 1.33
linux/fs/isofs/dir.c - 1.13
linux/fs/ioctl.c - 1.12
linux/fs/filesystems.c - 1.19
linux/fs/file_table.c - 1.18
linux/fs/fifo.c - 1.15
linux/fs/fat/inode.c - 1.36
linux/fs/fat/file.c - 1.19
linux/fs/fat/dir.c - 1.17
linux/fs/ext2/ioctl.c - 1.10
linux/fs/ext2/inode.c - 1.41
linux/fs/ext2/file.c - 1.19
linux/fs/ext2/balloc.c - 1.17
linux/fs/exec.c - 1.52
linux/fs/dquot.c - 1.48
linux/fs/devices.c - 1.19
linux/fs/coda/upcall.c - 1.16
linux/fs/coda/sysctl.c - 1.15
linux/fs/coda/symlink.c - 1.13
linux/fs/coda/psdev.c - 1.21
linux/fs/coda/pioctl.c - 1.13
linux/fs/coda/file.c - 1.18
linux/fs/coda/dir.c - 1.21
linux/fs/coda/coda_linux.c - 1.8
linux/fs/coda/cache.c - 1.11
linux/fs/buffer.c - 1.110
linux/fs/binfmt_script.c - 1.13
linux/fs/binfmt_elf.c - 1.38
linux/fs/binfmt_aout.c - 1.25
linux/fs/bad_inode.c - 1.10
linux/fs/autofs/waitq.c - 1.5
linux/fs/autofs/root.c - 1.16
linux/fs/autofs/autofs_i.h - 1.10
linux/fs/attr.c - 1.13
linux/fs/affs/super.c - 1.20
linux/fs/affs/namei.c - 1.15
linux/fs/affs/inode.c - 1.17
linux/fs/affs/file.c - 1.24
linux/fs/affs/bitmap.c - 1.8
linux/fs/affs/amigaffs.c - 1.11
linux/fs/adfs/super.c - 1.18
linux/fs/adfs/inode.c - 1.22
linux/fs/adfs/file.c - 1.12
linux/fs/adfs/dir.c - 1.15
linux/drivers/zorro/proc.c - 1.13
linux/drivers/usb/usb.c - 1.68
linux/drivers/sound/opl3sa2.c - 1.14
linux/drivers/scsi/aha1542.c - 1.23
linux/drivers/sbus/char/sunmouse.c - 1.14
linux/drivers/sbus/char/sunkbd.c - 1.19
linux/drivers/net/eepro100.c - 1.38
linux/drivers/net/bsd_comp.c - 1.9
linux/drivers/isdn/hisax/elsa.c - 1.17
linux/drivers/isdn/Makefile - 1.10
linux/drivers/char/random.c - 1.25
linux/arch/sparc64/solaris/timod.c - 1.19
linux/arch/sparc64/solaris/socksys.c - 1.16
linux/arch/sparc64/solaris/socket.c - 1.9
linux/arch/sparc64/solaris/misc.c - 1.22
linux/arch/sparc64/solaris/ioctl.c - 1.12
linux/arch/sparc64/solaris/fs.c - 1.17
linux/arch/sparc64/solaris/entry64.S - 1.4
linux/arch/sparc64/mm/ultra.S - 1.25
linux/arch/sparc64/mm/init.c - 1.39
linux/arch/sparc64/mm/fault.c - 1.20
linux/arch/sparc64/math-emu/math.c - 1.7
linux/arch/sparc64/lib/checksum.S - 1.5
linux/arch/sparc64/lib/blockops.S - 1.16
linux/arch/sparc64/lib/VISsave.S - 1.5
linux/arch/sparc64/lib/VIScsum.S - 1.5
linux/arch/sparc64/lib/VIScopy.S - 1.8
linux/arch/sparc64/kernel/winfixup.S - 1.5
linux/arch/sparc64/kernel/unaligned.c - 1.8
linux/arch/sparc64/kernel/ttable.S - 1.13
linux/arch/sparc64/kernel/traps.c - 1.18
linux/arch/sparc64/kernel/trampoline.S - 1.10
linux/arch/sparc64/kernel/systbls.S - 1.23
linux/arch/sparc64/kernel/sys_sunos32.c - 1.35
linux/arch/sparc64/kernel/sys_sparc32.c - 1.42
linux/arch/sparc64/kernel/sys_sparc.c - 1.23
linux/arch/sparc64/kernel/sparc64_ksyms.c - 1.39
linux/arch/sparc64/kernel/smp.c - 1.38
linux/arch/sparc64/kernel/signal32.c - 1.20
linux/arch/sparc64/kernel/signal.c - 1.18
linux/arch/sparc64/kernel/setup.c - 1.26
linux/arch/sparc64/kernel/rtrap.S - 1.14
linux/arch/sparc64/kernel/ptrace.c - 1.15
linux/arch/sparc64/kernel/process.c - 1.31
linux/arch/sparc64/kernel/itlb_base.S - 1.7
linux/arch/sparc64/kernel/init_task.c - 1.8
linux/arch/sparc64/kernel/head.S - 1.15
linux/arch/sparc64/kernel/etrap.S - 1.7
linux/arch/sparc64/kernel/entry.S - 1.20
linux/arch/sparc64/kernel/check_asm.sh - 1.7
linux/arch/sparc64/kernel/binfmt_elf32.c - 1.7
linux/arch/sparc64/kernel/binfmt_aout32.c - 1.17
linux/arch/sparc64/kernel/Makefile - 1.21
linux/arch/sparc64/defconfig - 1.60
linux/arch/sparc64/config.in - 1.51
linux/arch/sparc64/Makefile - 1.16
linux/arch/sparc/kernel/systbls.S - 1.20
linux/arch/sparc/kernel/sys_sunos.c - 1.34
linux/arch/sparc/kernel/signal.c - 1.21
linux/arch/i386/kernel/traps.c - 1.47
linux/arch/i386/kernel/smp.c - 1.41
linux/arch/i386/kernel/process.c - 1.44
linux/arch/i386/kernel/init_task.c - 1.9
linux/arch/i386/kernel/entry.S - 1.47
linux/arch/i386/defconfig - 1.97
linux/arch/i386/config.in - 1.72
linux/arch/alpha/defconfig - 1.22
linux/Makefile - 1.184
linux/MAINTAINERS - 1.95
linux/CREDITS - 1.72
linux/include/linux/efs_fs.h - 1.8
linux/fs/hpfs/inode.c - 1.16
linux/fs/hpfs/hpfs_fn.h - 1.16
linux/fs/hpfs/file.c - 1.18
linux/fs/hpfs/dir.c - 1.11
linux/fs/efs/inode.c - 1.10
linux/drivers/usb/acm.c - 1.46
linux/fs/file.c - 1.9
linux/drivers/char/sx.c - 1.23
linux/drivers/char/generic_serial.c - 1.13
linux/include/asm-i386/hw_irq.h - 1.24
linux/drivers/isdn/hisax/gazel.c - 1.12
linux/arch/i386/kernel/semaphore.c - 1.18
linux/arch/sparc64/kernel/pci_psycho.c - 1.26
linux/arch/sparc64/kernel/pci_common.c - 1.16
linux/drivers/pcmcia/cardbus.c - 1.20
linux/fs/udf/symlink.c - 1.14
linux/include/linux/spinlock.h - 1.13
linux/include/linux/highmem.h - 1.18
linux/include/asm-i386/highmem.h - 1.9
linux/include/linux/bfs_fs_i.h - 1.5
linux/fs/proc/proc_misc.c - 1.31
linux/fs/bfs/dir.c - 1.17
linux/include/asm-i386/pgalloc.h - 1.15
linux/include/asm-sparc64/sfp-machine.h - 1.3
linux/drivers/net/aironet4500_proc.c - 1.10
linux/drivers/char/agp/agpgart_be.c - 1.31
linux/include/asm-sparc64/pgalloc.h - 1.17
linux/drivers/usb/scanner.c - 1.30
linux/drivers/telephony/phonedev.c - 1.9
linux/drivers/usb/devio.c - 1.27
linux/drivers/usb/inode.c - 1.21
linux/include/asm-i386/io_apic.h - 1.6
linux/fs/autofs4/autofs_i.h - 1.8
linux/fs/autofs4/waitq.c - 1.6
linux/fs/autofs4/root.c - 1.12
linux/drivers/usb/usb-uhci.c - 1.39
linux/drivers/usb/usb-ohci.c - 1.36
linux/fs/adfs/dir_f.c - 1.6
linux/fs/adfs/dir_fplus.c - 1.5
linux/fs/devfs/base.c - 1.32
linux/fs/lockd/svc4proc.c - 1.5
linux/include/linux/brlock.h - 1.6
linux/drivers/usb/pegasus.c - 1.27
linux/drivers/char/sh-sci.c - 1.18
linux/include/linux/generic_serial.h - 1.4
linux/fs/nfs/flushd.c - 1.11
linux/drivers/usb/mdc800.c - 1.17
linux/include/linux/fs_struct.h - 1.6
linux/drivers/char/rio/rio_linux.c - 1.13
linux/arch/i386/kernel/msr.c - 1.15
linux/arch/i386/kernel/cpuid.c - 1.8
linux/include/asm-i386/i387.h - 1.6
linux/fs/jffs/inode-v23.c - 1.19
linux/fs/jffs/intrep.c - 1.10
linux/arch/i386/kernel/i387.c - 1.8
linux/arch/sparc64/lib/dec_and_lock.S - 1.4
linux/drivers/sound/ymfpci.c - 1.20
linux/include/linux/shmem_fs.h - 1.6
linux/fs/reiserfs/stree.c - 1.19
linux/fs/reiserfs/super.c - 1.17
linux/fs/reiserfs/tail_conversion.c - 1.13
linux/fs/reiserfs/prints.c - 1.11
linux/fs/reiserfs/objectid.c - 1.9
linux/fs/reiserfs/namei.c - 1.18
linux/fs/reiserfs/lbalance.c - 1.7
linux/fs/reiserfs/journal.c - 1.22
linux/fs/reiserfs/item_ops.c - 1.5
linux/fs/reiserfs/ioctl.c - 1.6
linux/fs/reiserfs/inode.c - 1.26
linux/fs/reiserfs/ibalance.c - 1.7
linux/fs/reiserfs/fix_node.c - 1.16
linux/fs/reiserfs/file.c - 1.8
linux/fs/reiserfs/do_balan.c - 1.9
linux/fs/reiserfs/buffer2.c - 1.10
linux/fs/reiserfs/bitmap.c - 1.13
linux/drivers/sound/cs4281/cs4281m.c - 1.10
linux/fs/freevxfs/vxfs_lookup.c - 1.4
linux/drivers/video/aty/mach64_accel.c - 1.3
linux/drivers/usb/kaweth.c - 1.12
linux/drivers/char/serial_tx3912.c - 1.5
linux/drivers/scsi/53c700.c - 1.6
linux/drivers/scsi/53c700.h - 1.4
linux/drivers/scsi/53c700.scr - 1.3
linux/drivers/scsi/NCR_D700.c - 1.2
linux/drivers/scsi/lasi700.c - 1.3
linux/drivers/usb/hid-core.c - 1.6
linux/fs/jffs2/background.c - 1.6
linux/fs/jffs2/dir.c - 1.5
linux/fs/jffs2/gc.c - 1.5
linux/fs/jffs/jffs_proc.c - 1.2
linux/fs/isofs/compress.c - 1.4
linux/fs/jbd/journal.c - 1.6
linux/fs/ext3/file.c - 1.3
linux/fs/ext3/fsync.c - 1.3
linux/fs/ext3/ialloc.c - 1.8
linux/fs/ext3/inode.c - 1.6
linux/fs/ext3/ioctl.c - 1.3
linux/fs/ext3/namei.c - 1.3
linux/fs/ext3/super.c - 1.11
linux/fs/intermezzo/file.c - 1.3
linux/fs/intermezzo/journal_ext2.c - 1.3
linux/fs/intermezzo/journal_ext3.c - 1.4
linux/fs/intermezzo/journal_obdfs.c - 1.4
linux/fs/intermezzo/journal_reiserfs.c - 1.4
linux/fs/intermezzo/journal_xfs.c - 1.5
linux/fs/intermezzo/methods.c - 1.4
linux/fs/intermezzo/presto.c - 1.5
linux/fs/intermezzo/psdev.c - 1.5
linux/fs/intermezzo/super.c - 1.3
linux/fs/intermezzo/sysctl.c - 1.4
linux/fs/intermezzo/upcall.c - 1.3
linux/fs/jbd/recovery.c - 1.4
linux/fs/jbd/revoke.c - 1.5
linux/fs/jbd/transaction.c - 1.5
linux/fs/reiserfs/procfs.c - 1.5
linux/fs/ext3/balloc.c - 1.3
linux/fs/jbd/commit.c - 1.4
linux/fs/intermezzo/cache.c - 1.3
linux/fs/jbd/checkpoint.c - 1.2
linux/fs/intermezzo/dir.c - 1.3
linux/fs/intermezzo/dcache.c - 1.4
linux/fs/driverfs/inode.c - 1.7
linux/drivers/usb/hcd/ehci-mem.c - 1.2
linux/include/linux/namespace.h - 1.2
linux/drivers/usb/hcd.c - 1.8
linux/drivers/usb/hcd/ehci-hub.c - 1.3
linux/drivers/usb/hcd/ehci-q.c - 1.5
linux/drivers/usb/hcd/ehci-sched.c - 1.4
linux/drivers/usb/auerswald.c - 1.5
linux/drivers/usb/hcd/ohci-q.c - 1.3
linux/drivers/usb/hcd/ohci-hcd.c - 1.3
linux/arch/alpha/Config.help - 1.3
linux/arch/arm/Config.help - 1.3
linux/arch/cris/Config.help - 1.3
linux/arch/i386/Config.help - 1.4
linux/arch/ia64/Config.help - 1.3
linux/arch/mips/Config.help - 1.2
linux/arch/mips64/Config.help - 1.2
linux/arch/ppc/Config.help - 1.3
linux/arch/sparc/Config.help - 1.2
linux/arch/sparc64/Config.help - 1.2
linux/drivers/base/interface.c - 1.4
linux/drivers/base/fs.c - 1.3
linux/drivers/base/core.c - 1.4
linux/drivers/pnp/pnpbios_core.c - 1.2
linux/include/asm-i386/thread_info.h - 1.2