From 963b1cd6f5237a8df0819497f54a700820b2b8d2 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Mon, 6 Dec 1999 23:13:20 +0000 Subject: Fix compilation errors, add .cvsignore files. --- arch/mips/arc/.cvsignore | 2 ++ arch/mips/kernel/entry.S | 7 ++++++- arch/mips/sgi/kernel/indy_mc.c | 4 ++-- drivers/char/joystick/.cvsignore | 2 ++ drivers/i2o/.cvsignore | 2 ++ drivers/isdn/.cvsignore | 2 ++ drivers/isdn/act2000/.cvsignore | 2 ++ drivers/isdn/avmb1/.cvsignore | 2 ++ drivers/isdn/divert/.cvsignore | 2 ++ drivers/isdn/eicon/.cvsignore | 2 ++ drivers/isdn/hisax/.cvsignore | 2 ++ drivers/isdn/icn/.cvsignore | 2 ++ drivers/isdn/pcbit/.cvsignore | 2 ++ include/asm-mips/sgi/sgihpc.h | 4 ++-- include/asm-mips/sgi/sgimc.h | 4 ++-- include/asm-mips/system.h | 6 ++++-- net/.cvsignore | 2 ++ net/802/.cvsignore | 2 ++ net/appletalk/.cvsignore | 2 ++ net/atm/.cvsignore | 2 ++ net/ax25/.cvsignore | 2 ++ net/bridge/.cvsignore | 2 ++ net/core/.cvsignore | 2 ++ net/decnet/.cvsignore | 2 ++ net/econet/.cvsignore | 2 ++ net/ethernet/.cvsignore | 2 ++ net/ipv4/.cvsignore | 2 ++ net/ipv6/.cvsignore | 2 ++ net/ipx/.cvsignore | 2 ++ net/irda/.cvsignore | 2 ++ net/irda/compressors/.cvsignore | 2 ++ net/irda/ircomm/.cvsignore | 2 ++ net/irda/irlan/.cvsignore | 2 ++ net/khttpd/.cvsignore | 2 ++ net/lapb/.cvsignore | 2 ++ net/netlink/.cvsignore | 2 ++ net/netrom/.cvsignore | 2 ++ net/packet/.cvsignore | 2 ++ net/rose/.cvsignore | 2 ++ net/sched/.cvsignore | 2 ++ net/sunrpc/.cvsignore | 2 ++ net/unix/.cvsignore | 2 ++ net/wanrouter/.cvsignore | 2 ++ net/x25/.cvsignore | 2 ++ 44 files changed, 94 insertions(+), 9 deletions(-) create mode 100644 arch/mips/arc/.cvsignore create mode 100644 drivers/char/joystick/.cvsignore create mode 100644 drivers/i2o/.cvsignore create mode 100644 drivers/isdn/.cvsignore create mode 100644 drivers/isdn/act2000/.cvsignore create mode 100644 drivers/isdn/avmb1/.cvsignore create mode 100644 drivers/isdn/divert/.cvsignore create mode 100644 drivers/isdn/eicon/.cvsignore create mode 100644 drivers/isdn/hisax/.cvsignore create mode 100644 drivers/isdn/icn/.cvsignore create mode 100644 drivers/isdn/pcbit/.cvsignore create mode 100644 net/.cvsignore create mode 100644 net/802/.cvsignore create mode 100644 net/appletalk/.cvsignore create mode 100644 net/atm/.cvsignore create mode 100644 net/ax25/.cvsignore create mode 100644 net/bridge/.cvsignore create mode 100644 net/core/.cvsignore create mode 100644 net/decnet/.cvsignore create mode 100644 net/econet/.cvsignore create mode 100644 net/ethernet/.cvsignore create mode 100644 net/ipv4/.cvsignore create mode 100644 net/ipv6/.cvsignore create mode 100644 net/ipx/.cvsignore create mode 100644 net/irda/.cvsignore create mode 100644 net/irda/compressors/.cvsignore create mode 100644 net/irda/ircomm/.cvsignore create mode 100644 net/irda/irlan/.cvsignore create mode 100644 net/khttpd/.cvsignore create mode 100644 net/lapb/.cvsignore create mode 100644 net/netlink/.cvsignore create mode 100644 net/netrom/.cvsignore create mode 100644 net/packet/.cvsignore create mode 100644 net/rose/.cvsignore create mode 100644 net/sched/.cvsignore create mode 100644 net/sunrpc/.cvsignore create mode 100644 net/unix/.cvsignore create mode 100644 net/wanrouter/.cvsignore create mode 100644 net/x25/.cvsignore diff --git a/arch/mips/arc/.cvsignore b/arch/mips/arc/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/arch/mips/arc/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S index 96925837e..53a5bf0ba 100644 --- a/arch/mips/kernel/entry.S +++ b/arch/mips/kernel/entry.S @@ -7,7 +7,7 @@ * * Copyright (C) 1994, 1995 by Ralf Baechle * - * $Id: entry.S,v 1.16 1999/08/18 23:37:43 ralf Exp $ + * $Id: entry.S,v 1.17 1999/12/04 03:58:59 ralf Exp $ */ /* @@ -40,6 +40,11 @@ .align 4 .set push .set reorder +EXPORT(ret_from_fork) + jal schedule_tail + move a0, v0 # prev + j ret_from_sys_call + nop EXPORT(handle_bottom_half) jal do_bottom_half b 9f diff --git a/arch/mips/sgi/kernel/indy_mc.c b/arch/mips/sgi/kernel/indy_mc.c index 4a16ef6f9..11a7c510f 100644 --- a/arch/mips/sgi/kernel/indy_mc.c +++ b/arch/mips/sgi/kernel/indy_mc.c @@ -4,7 +4,7 @@ * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu) - Indigo2 changes * - * $Id: indy_mc.c,v 1.6 1999/10/21 00:23:05 ralf Exp $ + * $Id: indy_mc.c,v 1.7 1999/12/04 03:59:00 ralf Exp $ */ #include #include @@ -18,7 +18,7 @@ /* #define DEBUG_SGIMC */ struct sgimc_misc_ctrl *mcmisc_regs; -unsigned int *rpsscounter; +u32 *rpsscounter; struct sgimc_dma_ctrl *dmactrlregs; static inline char *mconfig_string(unsigned long val) diff --git a/drivers/char/joystick/.cvsignore b/drivers/char/joystick/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/drivers/char/joystick/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/drivers/i2o/.cvsignore b/drivers/i2o/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/drivers/i2o/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/drivers/isdn/.cvsignore b/drivers/isdn/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/drivers/isdn/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/drivers/isdn/act2000/.cvsignore b/drivers/isdn/act2000/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/drivers/isdn/act2000/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/drivers/isdn/avmb1/.cvsignore b/drivers/isdn/avmb1/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/drivers/isdn/avmb1/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/drivers/isdn/divert/.cvsignore b/drivers/isdn/divert/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/drivers/isdn/divert/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/drivers/isdn/eicon/.cvsignore b/drivers/isdn/eicon/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/drivers/isdn/eicon/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/drivers/isdn/hisax/.cvsignore b/drivers/isdn/hisax/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/drivers/isdn/hisax/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/drivers/isdn/icn/.cvsignore b/drivers/isdn/icn/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/drivers/isdn/icn/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/drivers/isdn/pcbit/.cvsignore b/drivers/isdn/pcbit/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/drivers/isdn/pcbit/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/include/asm-mips/sgi/sgihpc.h b/include/asm-mips/sgi/sgihpc.h index 4bf59643e..93e447882 100644 --- a/include/asm-mips/sgi/sgihpc.h +++ b/include/asm-mips/sgi/sgihpc.h @@ -1,4 +1,4 @@ -/* $Id: sgihpc.h,v 1.7 1999/08/11 20:26:49 andrewb Exp $ +/* $Id: sgihpc.h,v 1.1 1999/10/21 00:23:05 ralf Exp $ * * sgihpc.h: Various HPC I/O controller defines. The HPC is basically * the approximate functional equivalent of the Sun SYSIO @@ -328,7 +328,7 @@ extern struct hpc3_miscregs *hpc3mregs; #define HPC3_MREGS_PBASE 0x1fbd9800 /* physical */ /* We need software copies of these because they are write only. */ -extern unsigned long sgi_hpc_write1, sgi_hpc_write2; +extern unsigned int sgi_hpc_write1, sgi_hpc_write2; struct hpc_keyb { #ifdef __MIPSEB__ diff --git a/include/asm-mips/sgi/sgimc.h b/include/asm-mips/sgi/sgimc.h index 808f562de..329acd954 100644 --- a/include/asm-mips/sgi/sgimc.h +++ b/include/asm-mips/sgi/sgimc.h @@ -1,4 +1,4 @@ -/* $Id: sgimc.h,v 1.1.1.1 1997/06/01 03:17:13 ralf Exp $ +/* $Id: sgimc.h,v 1.1 1999/10/21 00:23:05 ralf Exp $ * sgimc.h: Definitions for memory controller hardware found on * SGI IP20, IP22, IP26, and IP28 machines. * @@ -176,7 +176,7 @@ struct sgimc_misc_ctrl { /* MC misc control registers live at physical 0x1fa00000. */ extern struct sgimc_misc_ctrl *mcmisc_regs; -extern unsigned long *rpsscounter; /* Chirps at 100ns */ +extern u32 *rpsscounter; /* Chirps at 100ns */ struct sgimc_dma_ctrl { unsigned long _unused1; diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h index 1f8c2722a..d224086f6 100644 --- a/include/asm-mips/system.h +++ b/include/asm-mips/system.h @@ -1,4 +1,4 @@ -/* $Id: system.h,v 1.18 1999/11/17 22:48:12 ralf Exp $ +/* $Id: system.h,v 1.19 1999/12/04 03:59:12 ralf Exp $ * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -12,6 +12,8 @@ #define _ASM_SYSTEM_H #include +#include +#include #include extern __inline__ void @@ -187,7 +189,7 @@ extern __inline__ unsigned long xchg_u32(volatile int * m, unsigned long val) "1:\tmove\t$1,%2\n\t" "sc\t$1,(%1)\n\t" "beqzl\t$1,1b\n\t" - "lld\t%0,(%1)\n\t" + "ll\t%0,(%1)\n\t" ".set\tat\n\t" ".set\treorder" : "=r" (val), "=r" (m), "=r" (dummy) diff --git a/net/.cvsignore b/net/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/802/.cvsignore b/net/802/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/802/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/appletalk/.cvsignore b/net/appletalk/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/appletalk/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/atm/.cvsignore b/net/atm/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/atm/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/ax25/.cvsignore b/net/ax25/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/ax25/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/bridge/.cvsignore b/net/bridge/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/bridge/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/core/.cvsignore b/net/core/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/core/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/decnet/.cvsignore b/net/decnet/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/decnet/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/econet/.cvsignore b/net/econet/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/econet/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/ethernet/.cvsignore b/net/ethernet/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/ethernet/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/ipv4/.cvsignore b/net/ipv4/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/ipv4/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/ipv6/.cvsignore b/net/ipv6/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/ipv6/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/ipx/.cvsignore b/net/ipx/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/ipx/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/irda/.cvsignore b/net/irda/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/irda/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/irda/compressors/.cvsignore b/net/irda/compressors/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/irda/compressors/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/irda/ircomm/.cvsignore b/net/irda/ircomm/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/irda/ircomm/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/irda/irlan/.cvsignore b/net/irda/irlan/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/irda/irlan/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/khttpd/.cvsignore b/net/khttpd/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/khttpd/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/lapb/.cvsignore b/net/lapb/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/lapb/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/netlink/.cvsignore b/net/netlink/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/netlink/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/netrom/.cvsignore b/net/netrom/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/netrom/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/packet/.cvsignore b/net/packet/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/packet/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/rose/.cvsignore b/net/rose/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/rose/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/sched/.cvsignore b/net/sched/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/sched/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/sunrpc/.cvsignore b/net/sunrpc/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/sunrpc/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/unix/.cvsignore b/net/unix/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/unix/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/wanrouter/.cvsignore b/net/wanrouter/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/wanrouter/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags diff --git a/net/x25/.cvsignore b/net/x25/.cvsignore new file mode 100644 index 000000000..857dd22e9 --- /dev/null +++ b/net/x25/.cvsignore @@ -0,0 +1,2 @@ +.depend +.*.flags -- cgit v1.2.3