From 116674acc97ba75a720329996877077d988443a2 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 9 Mar 2001 20:33:35 +0000 Subject: Merge with Linux 2.4.2. --- arch/sparc64/config.in | 8 +++++--- arch/sparc64/kernel/binfmt_aout32.c | 2 +- arch/sparc64/kernel/ebus.c | 4 ++-- arch/sparc64/kernel/ioctl32.c | 6 +++--- arch/sparc64/kernel/irq.c | 4 ++-- arch/sparc64/kernel/pci_common.c | 4 ++-- arch/sparc64/kernel/pci_psycho.c | 4 ++-- arch/sparc64/kernel/pci_sabre.c | 4 ++-- arch/sparc64/kernel/pci_schizo.c | 4 ++-- arch/sparc64/kernel/process.c | 4 ++-- arch/sparc64/kernel/ptrace.c | 2 +- arch/sparc64/kernel/sbus.c | 4 ++-- arch/sparc64/kernel/setup.c | 4 ++-- arch/sparc64/kernel/starfire.c | 4 ++-- arch/sparc64/kernel/sys_sparc.c | 4 ++-- arch/sparc64/kernel/sys_sparc32.c | 4 ++-- arch/sparc64/kernel/sys_sunos32.c | 4 ++-- arch/sparc64/kernel/traps.c | 26 +++++++++++++++++++++++++- arch/sparc64/mm/init.c | 4 ++-- arch/sparc64/mm/modutil.c | 4 ++-- arch/sparc64/solaris/fs.c | 4 ++-- arch/sparc64/solaris/socket.c | 4 ++-- arch/sparc64/solaris/socksys.c | 4 ++-- 23 files changed, 71 insertions(+), 45 deletions(-) (limited to 'arch/sparc64') diff --git a/arch/sparc64/config.in b/arch/sparc64/config.in index 5c208915b..2d67b5e54 100644 --- a/arch/sparc64/config.in +++ b/arch/sparc64/config.in @@ -161,15 +161,15 @@ if [ "$CONFIG_SCSI" != "n" ]; then mainmenu_option next_comment comment 'SCSI low-level drivers' - tristate 'Sparc ESP Scsi Driver' CONFIG_SCSI_SUNESP $CONFIG_SCSI - tristate 'PTI Qlogic, ISP Driver' CONFIG_SCSI_QLOGICPTI $CONFIG_SCSI + dep_tristate 'Sparc ESP Scsi Driver' CONFIG_SCSI_SUNESP $CONFIG_SCSI + dep_tristate 'PTI Qlogic, ISP Driver' CONFIG_SCSI_QLOGICPTI $CONFIG_SCSI if [ "$CONFIG_PCI" != "n" ]; then dep_tristate 'Adaptec AIC7xxx support' CONFIG_SCSI_AIC7XXX $CONFIG_SCSI if [ "$CONFIG_SCSI_AIC7XXX" != "n" ]; then bool ' Enable tagged command queueing (TCQ) by default' CONFIG_AIC7XXX_TAGGED_QUEUEING int ' Maximum number of TCQ commands per device' CONFIG_AIC7XXX_CMDS_PER_DEVICE 8 - bool ' Collect statistics to report in /proc' CONFIG_AIC7XXX_PROC_STATS N + bool ' Collect statistics to report in /proc' CONFIG_AIC7XXX_PROC_STATS int ' Delay in seconds after SCSI bus reset' CONFIG_AIC7XXX_RESET_DELAY 5 fi dep_tristate 'NCR53C8XX SCSI support' CONFIG_SCSI_NCR53C8XX $CONFIG_SCSI @@ -197,6 +197,8 @@ if [ "$CONFIG_SCSI" != "n" ]; then fi endmenu +source drivers/message/fusion/Config.in + source drivers/fc4/Config.in if [ "$CONFIG_PCI" = "y" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then diff --git a/arch/sparc64/kernel/binfmt_aout32.c b/arch/sparc64/kernel/binfmt_aout32.c index b066b8b96..bda2fb6a5 100644 --- a/arch/sparc64/kernel/binfmt_aout32.c +++ b/arch/sparc64/kernel/binfmt_aout32.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c index e175fac27..6dbe45a6c 100644 --- a/arch/sparc64/kernel/ebus.c +++ b/arch/sparc64/kernel/ebus.c @@ -1,4 +1,4 @@ -/* $Id: ebus.c,v 1.53 2000/11/08 05:08:23 davem Exp $ +/* $Id: ebus.c,v 1.54 2001/02/13 01:16:44 davem Exp $ * ebus.c: PCI to EBus bridge device. * * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/sparc64/kernel/ioctl32.c b/arch/sparc64/kernel/ioctl32.c index 67c1ec6d0..e2cdc3613 100644 --- a/arch/sparc64/kernel/ioctl32.c +++ b/arch/sparc64/kernel/ioctl32.c @@ -1,4 +1,4 @@ -/* $Id: ioctl32.c,v 1.105 2001/01/18 04:47:44 davem Exp $ +/* $Id: ioctl32.c,v 1.107 2001/02/13 01:16:44 davem Exp $ * ioctl32.c: Conversion between 32bit and 64bit native ioctls. * * Copyright (C) 1997-2000 Jakub Jelinek (jakub@redhat.com) @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include @@ -3770,7 +3770,7 @@ IOCTL_TABLE_END unsigned int ioctl32_hash_table[1024]; -extern inline unsigned long ioctl32_hash(unsigned long cmd) +static inline unsigned long ioctl32_hash(unsigned long cmd) { return ((cmd >> 6) ^ (cmd >> 4) ^ cmd) & 0x3ff; } diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c index 92bd3ed88..1bd29505b 100644 --- a/arch/sparc64/kernel/irq.c +++ b/arch/sparc64/kernel/irq.c @@ -1,4 +1,4 @@ -/* $Id: irq.c,v 1.94 2000/09/21 06:27:10 anton Exp $ +/* $Id: irq.c,v 1.95 2001/02/13 01:16:44 davem Exp $ * irq.c: UltraSparc IRQ handling/init/registry. * * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include /* XXX ADD add_foo_randomness() calls... -DaveM */ #include #include diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c index 14473724f..ff7060c0a 100644 --- a/arch/sparc64/kernel/pci_common.c +++ b/arch/sparc64/kernel/pci_common.c @@ -1,11 +1,11 @@ -/* $Id: pci_common.c,v 1.12 2000/05/01 06:32:49 davem Exp $ +/* $Id: pci_common.c,v 1.13 2001/02/13 01:16:44 davem Exp $ * pci_common.c: PCI controller common support. * * Copyright (C) 1999 David S. Miller (davem@redhat.com) */ #include -#include +#include #include #include diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c index fbd7832cd..7a671158e 100644 --- a/arch/sparc64/kernel/pci_psycho.c +++ b/arch/sparc64/kernel/pci_psycho.c @@ -1,4 +1,4 @@ -/* $Id: pci_psycho.c,v 1.18 2001/01/11 16:26:45 davem Exp $ +/* $Id: pci_psycho.c,v 1.19 2001/02/13 01:16:44 davem Exp $ * pci_psycho.c: PSYCHO/U2P specific PCI controller support. * * Copyright (C) 1997, 1998, 1999 David S. Miller (davem@caipfs.rutgers.edu) @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c index ec74a3696..cce2e5467 100644 --- a/arch/sparc64/kernel/pci_sabre.c +++ b/arch/sparc64/kernel/pci_sabre.c @@ -1,4 +1,4 @@ -/* $Id: pci_sabre.c,v 1.22 2001/01/16 13:03:48 anton Exp $ +/* $Id: pci_sabre.c,v 1.23 2001/02/13 01:16:44 davem Exp $ * pci_sabre.c: Sabre specific PCI controller support. * * Copyright (C) 1997, 1998, 1999 David S. Miller (davem@caipfs.rutgers.edu) @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c index 9299c2531..daac0d783 100644 --- a/arch/sparc64/kernel/pci_schizo.c +++ b/arch/sparc64/kernel/pci_schizo.c @@ -1,4 +1,4 @@ -/* $Id: pci_schizo.c,v 1.2 2001/01/12 02:43:30 davem Exp $ +/* $Id: pci_schizo.c,v 1.3 2001/02/13 01:16:44 davem Exp $ * pci_schizo.c: SCHIZO specific PCI controller support. * * Copyright (C) 2001 David S. Miller (davem@redhat.com) @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c index 4534ad59b..3fc337d71 100644 --- a/arch/sparc64/kernel/process.c +++ b/arch/sparc64/kernel/process.c @@ -1,4 +1,4 @@ -/* $Id: process.c,v 1.113 2000/11/08 08:14:58 davem Exp $ +/* $Id: process.c,v 1.114 2001/02/13 01:16:44 davem Exp $ * arch/sparc64/kernel/process.c * * Copyright (C) 1995, 1996 David S. Miller (davem@caip.rutgers.edu) @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c index 977d0f35a..7f791c4d0 100644 --- a/arch/sparc64/kernel/ptrace.c +++ b/arch/sparc64/kernel/ptrace.c @@ -6,7 +6,7 @@ * Based upon code written by Ross Biro, Linus Torvalds, Bob Manson, * and David Mosberger. * - * Added Linux support -miguel (wierd, eh?, the orignal code was meant + * Added Linux support -miguel (weird, eh?, the orignal code was meant * to emulate SunOS). */ diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c index 7baebc89e..30cac5e00 100644 --- a/arch/sparc64/kernel/sbus.c +++ b/arch/sparc64/kernel/sbus.c @@ -1,4 +1,4 @@ -/* $Id: sbus.c,v 1.12 2000/09/21 06:25:14 anton Exp $ +/* $Id: sbus.c,v 1.13 2001/02/13 01:16:44 davem Exp $ * sbus.c: UltraSparc SBUS controller support. * * Copyright (C) 1999 David S. Miller (davem@redhat.com) @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c index 11d29f21f..7817f4566 100644 --- a/arch/sparc64/kernel/setup.c +++ b/arch/sparc64/kernel/setup.c @@ -1,4 +1,4 @@ -/* $Id: setup.c,v 1.58 2001/01/01 01:46:15 davem Exp $ +/* $Id: setup.c,v 1.59 2001/02/13 01:16:44 davem Exp $ * linux/arch/sparc64/kernel/setup.c * * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu) @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/sparc64/kernel/starfire.c b/arch/sparc64/kernel/starfire.c index 6899e7c4a..4d89be41e 100644 --- a/arch/sparc64/kernel/starfire.c +++ b/arch/sparc64/kernel/starfire.c @@ -1,4 +1,4 @@ -/* $Id: starfire.c,v 1.8 2000/10/27 18:36:47 anton Exp $ +/* $Id: starfire.c,v 1.9 2001/02/13 01:16:44 davem Exp $ * starfire.c: Starfire/E10000 support. * * Copyright (C) 1998 David S. Miller (davem@redhat.com) @@ -6,7 +6,7 @@ */ #include -#include +#include #include #include diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c index 391979c87..e3cd81c97 100644 --- a/arch/sparc64/kernel/sys_sparc.c +++ b/arch/sparc64/kernel/sys_sparc.c @@ -1,4 +1,4 @@ -/* $Id: sys_sparc.c,v 1.47 2000/11/29 05:56:12 anton Exp $ +/* $Id: sys_sparc.c,v 1.48 2001/02/13 01:16:44 davem Exp $ * linux/arch/sparc64/kernel/sys_sparc.c * * This file contains various random system calls that @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c index 184b4169d..d68b75cab 100644 --- a/arch/sparc64/kernel/sys_sparc32.c +++ b/arch/sparc64/kernel/sys_sparc32.c @@ -1,4 +1,4 @@ -/* $Id: sys_sparc32.c,v 1.172 2001/01/24 21:05:13 davem Exp $ +/* $Id: sys_sparc32.c,v 1.173 2001/02/13 01:16:44 davem Exp $ * sys_sparc32.c: Conversion between 32bit and 64bit native syscalls. * * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/sparc64/kernel/sys_sunos32.c b/arch/sparc64/kernel/sys_sunos32.c index 58e4704c4..bfbd8841c 100644 --- a/arch/sparc64/kernel/sys_sunos32.c +++ b/arch/sparc64/kernel/sys_sunos32.c @@ -1,4 +1,4 @@ -/* $Id: sys_sunos32.c,v 1.56 2001/01/04 05:35:48 davem Exp $ +/* $Id: sys_sunos32.c,v 1.57 2001/02/13 01:16:44 davem Exp $ * sys_sunos32.c: SunOS binary compatability layer on sparc64. * * Copyright (C) 1995, 1996, 1997 David S. Miller (davem@caip.rutgers.edu) @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c index 2562df1f3..cc703d3bc 100644 --- a/arch/sparc64/kernel/traps.c +++ b/arch/sparc64/kernel/traps.c @@ -1,4 +1,4 @@ -/* $Id: traps.c,v 1.68 2000/11/22 06:50:37 davem Exp $ +/* $Id: traps.c,v 1.70 2001/02/09 05:46:44 davem Exp $ * arch/sparc64/kernel/traps.c * * Copyright (C) 1995,1997 David S. Miller (davem@caip.rutgers.edu) @@ -639,6 +639,30 @@ void user_instruction_dump (unsigned int *pc) printk("\n"); } +void show_trace_task(struct task_struct *tsk) +{ + unsigned long pc, fp; + unsigned long task_base = (unsigned long)tsk; + struct reg_window *rw; + int count = 0; + + if (!tsk) + return; + + fp = tsk->thread.ksp + STACK_BIAS; + do { + /* Bogus frame pointer? */ + if (fp < (task_base + sizeof(struct task_struct)) || + fp >= (task_base + (2 * PAGE_SIZE))) + break; + rw = (struct reg_window *)fp; + pc = rw->ins[7]; + printk("[%016lx] ", pc); + fp = rw->ins[6] + STACK_BIAS; + } while (++count < 16); + printk("\n"); +} + void die_if_kernel(char *str, struct pt_regs *regs) { extern void __show_regs(struct pt_regs * regs); diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index 289092756..15407f4f4 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c @@ -1,4 +1,4 @@ -/* $Id: init.c,v 1.161 2000/12/09 20:16:58 davem Exp $ +/* $Id: init.c,v 1.162 2001/02/13 01:16:44 davem Exp $ * arch/sparc64/mm/init.c * * Copyright (C) 1996-1999 David S. Miller (davem@caip.rutgers.edu) @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/sparc64/mm/modutil.c b/arch/sparc64/mm/modutil.c index b8e2833f0..41bd1f077 100644 --- a/arch/sparc64/mm/modutil.c +++ b/arch/sparc64/mm/modutil.c @@ -1,11 +1,11 @@ -/* $Id: modutil.c,v 1.6 2000/06/26 23:20:24 davem Exp $ +/* $Id: modutil.c,v 1.7 2001/02/13 01:16:44 davem Exp $ * arch/sparc64/mm/modutil.c * * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) * Based upon code written by Linus Torvalds and others. */ -#include +#include #include #include diff --git a/arch/sparc64/solaris/fs.c b/arch/sparc64/solaris/fs.c index e80d6b13f..8ca96f5b2 100644 --- a/arch/sparc64/solaris/fs.c +++ b/arch/sparc64/solaris/fs.c @@ -1,4 +1,4 @@ -/* $Id: fs.c,v 1.23 2000/08/29 07:01:54 davem Exp $ +/* $Id: fs.c,v 1.24 2001/02/13 01:16:44 davem Exp $ * fs.c: fs related syscall emulation for Solaris * * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/sparc64/solaris/socket.c b/arch/sparc64/solaris/socket.c index e016e4b1a..e40b38092 100644 --- a/arch/sparc64/solaris/socket.c +++ b/arch/sparc64/solaris/socket.c @@ -1,4 +1,4 @@ -/* $Id: socket.c,v 1.4 2000/11/18 02:11:00 davem Exp $ +/* $Id: socket.c,v 1.5 2001/02/13 01:16:44 davem Exp $ * socket.c: Socket syscall emulation for Solaris 2.6+ * * Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz) @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/sparc64/solaris/socksys.c b/arch/sparc64/solaris/socksys.c index bf2182381..a8e695c04 100644 --- a/arch/sparc64/solaris/socksys.c +++ b/arch/sparc64/solaris/socksys.c @@ -1,4 +1,4 @@ -/* $Id: socksys.c,v 1.17 2000/10/19 00:49:53 davem Exp $ +/* $Id: socksys.c,v 1.18 2001/02/13 01:16:44 davem Exp $ * socksys.c: /dev/inet/ stuff for Solaris emulation. * * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include -- cgit v1.2.3