summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/mips/arc/identify.c4
-rw-r--r--arch/mips/kernel/mips_ksyms.c4
-rw-r--r--arch/mips/mm/r4xx0.c5
-rw-r--r--arch/mips/sgi/kernel/indy_hpc.c6
-rw-r--r--arch/mips/sgi/kernel/indy_int.c8
-rw-r--r--arch/mips/sgi/kernel/indy_mc.c6
-rw-r--r--arch/mips/sgi/kernel/indy_rtc.c4
-rw-r--r--arch/mips/sgi/kernel/indy_sc.c6
-rw-r--r--arch/mips/sgi/kernel/indy_timer.c8
-rw-r--r--arch/mips/sgi/kernel/reset.c6
-rw-r--r--arch/mips/sgi/kernel/setup.c9
-rw-r--r--arch/mips/sgi/kernel/system.c4
-rw-r--r--arch/mips64/mm/r4xx0.c5
-rw-r--r--drivers/net/sgiseeq.c6
-rw-r--r--drivers/scsi/sgiwd93.c10
-rw-r--r--drivers/sgi/char/sgiserial.c4
-rw-r--r--include/asm-mips/semaphore-helper.h6
-rw-r--r--include/asm-mips/sgi/sgi.h (renamed from include/asm-mips/sgi.h)2
-rw-r--r--include/asm-mips/sgi/sgihpc.h (renamed from include/asm-mips/sgihpc.h)2
-rw-r--r--include/asm-mips/sgi/sgimc.h (renamed from include/asm-mips/sgimc.h)2
-rw-r--r--include/asm-mips/sgi/sgint23.h (renamed from include/asm-mips/sgint23.h)2
21 files changed, 52 insertions, 57 deletions
diff --git a/arch/mips/arc/identify.c b/arch/mips/arc/identify.c
index 4e3a3653f..8cc0a22ed 100644
--- a/arch/mips/arc/identify.c
+++ b/arch/mips/arc/identify.c
@@ -7,14 +7,14 @@
*
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
*
- * $Id: identify.c,v 1.1 1998/10/18 13:32:09 tsbogend Exp $
+ * $Id: identify.c,v 1.2 1999/02/25 21:04:13 tsbogend Exp $
*/
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/string.h>
-#include <asm/sgi.h>
+#include <asm/sgi/sgi.h>
#include <asm/sgialib.h>
#include <asm/bootinfo.h>
diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c
index 7d5044942..f66f3942e 100644
--- a/arch/mips/kernel/mips_ksyms.c
+++ b/arch/mips/kernel/mips_ksyms.c
@@ -1,4 +1,4 @@
-/* $Id: mips_ksyms.c,v 1.19 1999/04/11 18:37:55 harald Exp $
+/* $Id: mips_ksyms.c,v 1.20 1999/08/20 21:59:02 ralf Exp $
*
* Export MIPS-specific functions needed for loadable modules.
*
@@ -23,7 +23,7 @@
#include <asm/io.h>
#include <asm/page.h>
#include <asm/pgtable.h>
-#include <asm/sgihpc.h>
+#include <asm/sgi/sgihpc.h>
#include <asm/softirq.h>
#include <asm/uaccess.h>
diff --git a/arch/mips/mm/r4xx0.c b/arch/mips/mm/r4xx0.c
index 68be4e799..6005bca95 100644
--- a/arch/mips/mm/r4xx0.c
+++ b/arch/mips/mm/r4xx0.c
@@ -1,4 +1,4 @@
-/* $Id: r4xx0.c,v 1.24 1999/09/28 22:25:48 ralf Exp $
+/* $Id: r4xx0.c,v 1.25 1999/10/09 00:00:58 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
@@ -22,13 +22,10 @@
#include <asm/bcache.h>
#include <asm/io.h>
-#include <asm/sgi.h>
-#include <asm/sgimc.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/system.h>
#include <asm/bootinfo.h>
-#include <asm/sgialib.h>
#include <asm/mmu_context.h>
/* CP0 hazard avoidance. */
diff --git a/arch/mips/sgi/kernel/indy_hpc.c b/arch/mips/sgi/kernel/indy_hpc.c
index 2287bdde8..5a2663716 100644
--- a/arch/mips/sgi/kernel/indy_hpc.c
+++ b/arch/mips/sgi/kernel/indy_hpc.c
@@ -1,4 +1,4 @@
-/* $Id: indy_hpc.c,v 1.6 1999/05/07 22:34:31 ulfc Exp $
+/* $Id: indy_hpc.c,v 1.7 1999/10/09 00:00:59 ralf Exp $
*
* indy_hpc.c: Routines for generic manipulation of the HPC controllers.
*
@@ -8,8 +8,8 @@
#include <linux/init.h>
#include <asm/addrspace.h>
-#include <asm/sgihpc.h>
-#include <asm/sgint23.h>
+#include <asm/sgi/sgihpc.h>
+#include <asm/sgi/sgint23.h>
#include <asm/sgialib.h>
/* #define DEBUG_SGIHPC */
diff --git a/arch/mips/sgi/kernel/indy_int.c b/arch/mips/sgi/kernel/indy_int.c
index 60ce3e0f1..d7055da01 100644
--- a/arch/mips/sgi/kernel/indy_int.c
+++ b/arch/mips/sgi/kernel/indy_int.c
@@ -1,4 +1,4 @@
-/* $Id: indy_int.c,v 1.13 1999/06/12 17:26:15 ulfc Exp $
+/* $Id: indy_int.c,v 1.14 1999/10/09 00:00:59 ralf Exp $
*
* indy_int.c: Routines for generic manipulation of the INT[23] ASIC
* found on INDY workstations..
@@ -34,9 +34,9 @@
#include <asm/ptrace.h>
#include <asm/processor.h>
-#include <asm/sgi.h>
-#include <asm/sgihpc.h>
-#include <asm/sgint23.h>
+#include <asm/sgi/sgi.h>
+#include <asm/sgi/sgihpc.h>
+#include <asm/sgi/sgint23.h>
#include <asm/sgialib.h>
#include <asm/gdb-stub.h>
diff --git a/arch/mips/sgi/kernel/indy_mc.c b/arch/mips/sgi/kernel/indy_mc.c
index acd07cfdc..2b5b50125 100644
--- a/arch/mips/sgi/kernel/indy_mc.c
+++ b/arch/mips/sgi/kernel/indy_mc.c
@@ -4,15 +4,15 @@
* 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.4 1999/05/07 22:34:32 ulfc Exp $
+ * $Id: indy_mc.c,v 1.5 1999/10/09 00:00:59 ralf Exp $
*/
#include <linux/init.h>
#include <linux/kernel.h>
#include <asm/addrspace.h>
#include <asm/ptrace.h>
-#include <asm/sgimc.h>
-#include <asm/sgihpc.h>
+#include <asm/sgi/sgimc.h>
+#include <asm/sgi/sgihpc.h>
#include <asm/sgialib.h>
/* #define DEBUG_SGIMC */
diff --git a/arch/mips/sgi/kernel/indy_rtc.c b/arch/mips/sgi/kernel/indy_rtc.c
index 5ef066773..bad4f6667 100644
--- a/arch/mips/sgi/kernel/indy_rtc.c
+++ b/arch/mips/sgi/kernel/indy_rtc.c
@@ -1,4 +1,4 @@
-/* $Id: indy_rtc.c,v 1.1 1998/06/25 20:19:17 ralf Exp $
+/* $Id: indy_rtc.c,v 1.1 1998/06/30 00:21:58 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
@@ -9,7 +9,7 @@
* Copyright (C) 1998 by Ralf Baechle
*/
#include <linux/mc146818rtc.h>
-#include <asm/sgihpc.h>
+#include <asm/sgi/sgihpc.h>
static unsigned char indy_rtc_read_data(unsigned long addr)
{
diff --git a/arch/mips/sgi/kernel/indy_sc.c b/arch/mips/sgi/kernel/indy_sc.c
index 461691304..a6123810f 100644
--- a/arch/mips/sgi/kernel/indy_sc.c
+++ b/arch/mips/sgi/kernel/indy_sc.c
@@ -1,4 +1,4 @@
-/* $Id: indy_sc.c,v 1.10 1999/09/28 22:25:49 ralf Exp $
+/* $Id: indy_sc.c,v 1.11 1999/10/09 00:00:59 ralf Exp $
*
* indy_sc.c: Indy cache managment functions.
*
@@ -11,8 +11,8 @@
#include <linux/mm.h>
#include <asm/bcache.h>
-#include <asm/sgi.h>
-#include <asm/sgimc.h>
+#include <asm/sgi/sgi.h>
+#include <asm/sgi/sgimc.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/system.h>
diff --git a/arch/mips/sgi/kernel/indy_timer.c b/arch/mips/sgi/kernel/indy_timer.c
index 8a1e8d829..162d0e32d 100644
--- a/arch/mips/sgi/kernel/indy_timer.c
+++ b/arch/mips/sgi/kernel/indy_timer.c
@@ -1,4 +1,4 @@
-/* $Id: indy_timer.c,v 1.13 1999/08/20 21:59:03 ralf Exp $
+/* $Id: indy_timer.c,v 1.14 1999/10/09 00:00:59 ralf Exp $
*
* indy_timer.c: Setting up the clock on the INDY 8254 controller.
*
@@ -21,10 +21,10 @@
#include <asm/irq.h>
#include <asm/ptrace.h>
#include <asm/system.h>
-#include <asm/sgi.h>
#include <asm/sgialib.h>
-#include <asm/sgihpc.h>
-#include <asm/sgint23.h>
+#include <asm/sgi/sgi.h>
+#include <asm/sgi/sgihpc.h>
+#include <asm/sgi/sgint23.h>
/* Because of a bug in the i8254 timer we need to use the onchip r4k
diff --git a/arch/mips/sgi/kernel/reset.c b/arch/mips/sgi/kernel/reset.c
index ace23da4f..8efde598c 100644
--- a/arch/mips/sgi/kernel/reset.c
+++ b/arch/mips/sgi/kernel/reset.c
@@ -1,4 +1,4 @@
-/* $Id: reset.c,v 1.6 1999/04/10 12:21:30 ulfc Exp $
+/* $Id: reset.c,v 1.7 1999/08/11 20:26:51 andrewb Exp $
*
* Reset a SGI.
*
@@ -17,8 +17,8 @@
#include <asm/system.h>
#include <asm/reboot.h>
#include <asm/sgialib.h>
-#include <asm/sgihpc.h>
-#include <asm/sgint23.h>
+#include <asm/sgi/sgihpc.h>
+#include <asm/sgi/sgint23.h>
/*
* Just powerdown if init hasn't done after POWERDOWN_TIMEOUT seconds.
diff --git a/arch/mips/sgi/kernel/setup.c b/arch/mips/sgi/kernel/setup.c
index 57a56a871..6d3fd4b0c 100644
--- a/arch/mips/sgi/kernel/setup.c
+++ b/arch/mips/sgi/kernel/setup.c
@@ -1,4 +1,4 @@
-/* $Id: setup.c,v 1.25 1999/08/21 22:19:12 ralf Exp $
+/* $Id: setup.c,v 1.26 1999/10/09 00:00:59 ralf Exp $
*
* setup.c: SGI specific setup, including init of the feature struct.
*
@@ -22,10 +22,9 @@
#include <asm/irq.h>
#include <asm/reboot.h>
#include <asm/sgialib.h>
-#include <asm/sgi.h>
-#include <asm/sgimc.h>
-#include <asm/sgihpc.h>
-#include <asm/sgint23.h>
+#include <asm/sgi/sgimc.h>
+#include <asm/sgi/sgihpc.h>
+#include <asm/sgi/sgint23.h>
#include <asm/gdb-stub.h>
#ifdef CONFIG_REMOTE_DEBUG
diff --git a/arch/mips/sgi/kernel/system.c b/arch/mips/sgi/kernel/system.c
index 7f5a3130b..29bf6ced2 100644
--- a/arch/mips/sgi/kernel/system.c
+++ b/arch/mips/sgi/kernel/system.c
@@ -3,14 +3,14 @@
*
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
*
- * $Id: system.c,v 1.7 1998/10/18 22:55:34 tsbogend Exp $
+ * $Id: system.c,v 1.8 1999/10/09 00:00:59 ralf Exp $
*/
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/string.h>
-#include <asm/sgi.h>
+#include <asm/sgi/sgi.h>
#include <asm/sgialib.h>
#include <asm/bootinfo.h>
diff --git a/arch/mips64/mm/r4xx0.c b/arch/mips64/mm/r4xx0.c
index 8631ab7db..b026dc4a6 100644
--- a/arch/mips64/mm/r4xx0.c
+++ b/arch/mips64/mm/r4xx0.c
@@ -1,4 +1,4 @@
-/* $Id: r4xx0.c,v 1.2 1999/08/21 22:19:16 ralf Exp $
+/* $Id: r4xx0.c,v 1.3 1999/09/28 22:25:52 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
@@ -17,13 +17,10 @@
#include <asm/bcache.h>
#include <asm/io.h>
-//#include <asm/sgi.h>
-//#include <asm/sgimc.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/system.h>
#include <asm/bootinfo.h>
-#include <asm/sgialib.h>
#include <asm/mmu_context.h>
/* CP0 hazard avoidance. */
diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c
index c6a453b61..234242746 100644
--- a/drivers/net/sgiseeq.c
+++ b/drivers/net/sgiseeq.c
@@ -1,4 +1,4 @@
-/* $Id: sgiseeq.c,v 1.10 1999/08/11 20:26:50 andrewb Exp $
+/* $Id: sgiseeq.c,v 1.11 1999/10/09 00:01:24 ralf Exp $
*
* sgiseeq.c: Seeq8003 ethernet driver for SGI machines.
*
@@ -31,8 +31,8 @@
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
-#include <asm/sgihpc.h>
-#include <asm/sgint23.h>
+#include <asm/sgi/sgihpc.h>
+#include <asm/sgi/sgint23.h>
#include <asm/sgialib.h>
#include "sgiseeq.h"
diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c
index 057bf3873..b2196ff23 100644
--- a/drivers/scsi/sgiwd93.c
+++ b/drivers/scsi/sgiwd93.c
@@ -7,7 +7,7 @@
*
* (In all truth, Jed Schimmel wrote all this code.)
*
- * $Id: sgiwd93.c,v 1.15 1999/08/11 20:26:51 andrewb Exp $
+ * $Id: sgiwd93.c,v 1.16 1999/10/09 00:01:31 ralf Exp $
*/
#include <linux/init.h>
#include <linux/types.h>
@@ -19,11 +19,11 @@
#include <asm/page.h>
#include <asm/pgtable.h>
-#include <asm/sgi.h>
#include <asm/sgialib.h>
-#include <asm/sgimc.h>
-#include <asm/sgihpc.h>
-#include <asm/sgint23.h>
+#include <asm/sgi/sgi.h>
+#include <asm/sgi/sgimc.h>
+#include <asm/sgi/sgihpc.h>
+#include <asm/sgi/sgint23.h>
#include <asm/irq.h>
#include <asm/io.h>
diff --git a/drivers/sgi/char/sgiserial.c b/drivers/sgi/char/sgiserial.c
index 08cc902df..ed9928cdd 100644
--- a/drivers/sgi/char/sgiserial.c
+++ b/drivers/sgi/char/sgiserial.c
@@ -37,8 +37,8 @@
#include <asm/sgialib.h>
#include <asm/system.h>
#include <asm/bitops.h>
-#include <asm/sgihpc.h>
-#include <asm/sgint23.h>
+#include <asm/sgi/sgihpc.h>
+#include <asm/sgi/sgint23.h>
#include <asm/uaccess.h>
#include "sgiserial.h"
diff --git a/include/asm-mips/semaphore-helper.h b/include/asm-mips/semaphore-helper.h
index 824bcb49f..557dfe2eb 100644
--- a/include/asm-mips/semaphore-helper.h
+++ b/include/asm-mips/semaphore-helper.h
@@ -1,4 +1,4 @@
-/* $Id: semaphore-helper.h,v 1.5 1999/08/13 17:07:27 harald Exp $
+/* $Id: semaphore-helper.h,v 1.6 1999/10/20 21:10:58 ralf Exp $
*
* SMP- and interrupt-safe semaphores helper functions.
*
@@ -78,7 +78,7 @@ static inline int waking_non_zero_trylock(struct semaphore *sem)
return ret;
}
-#else
+#else /* CONFIG_CPU_HAS_LLSC */
static inline int
waking_non_zero(struct semaphore *sem)
@@ -218,4 +218,6 @@ waking_non_zero_trylock(struct semaphore *sem)
return 0;
}
+#endif /* CONFIG_CPU_HAS_LLSC */
+
#endif /* _ASM_SEMAPHORE_HELPER_H */
diff --git a/include/asm-mips/sgi.h b/include/asm-mips/sgi/sgi.h
index b49623eaf..bafe60b57 100644
--- a/include/asm-mips/sgi.h
+++ b/include/asm-mips/sgi/sgi.h
@@ -1,4 +1,4 @@
-/* $Id: sgi.h,v 1.3 1996/06/25 07:18:24 dm Exp $
+/* $Id: sgi.h,v 1.1.1.1 1997/06/01 03:17:12 ralf Exp $
* sgi.h: Definitions specific to SGI machines.
*
* Copyright (C) 1996 David S. Miller (dm@sgi.com)
diff --git a/include/asm-mips/sgihpc.h b/include/asm-mips/sgi/sgihpc.h
index 3b0aec963..4bf59643e 100644
--- a/include/asm-mips/sgihpc.h
+++ b/include/asm-mips/sgi/sgihpc.h
@@ -1,4 +1,4 @@
-/* $Id: sgihpc.h,v 1.6 1999/04/01 23:24:00 ulfc Exp $
+/* $Id: sgihpc.h,v 1.7 1999/08/11 20:26:49 andrewb Exp $
*
* sgihpc.h: Various HPC I/O controller defines. The HPC is basically
* the approximate functional equivalent of the Sun SYSIO
diff --git a/include/asm-mips/sgimc.h b/include/asm-mips/sgi/sgimc.h
index 70bec8b1e..808f562de 100644
--- a/include/asm-mips/sgimc.h
+++ b/include/asm-mips/sgi/sgimc.h
@@ -1,4 +1,4 @@
-/* $Id: sgimc.h,v 1.4 1996/06/25 07:18:24 dm Exp $
+/* $Id: sgimc.h,v 1.1.1.1 1997/06/01 03:17:13 ralf Exp $
* sgimc.h: Definitions for memory controller hardware found on
* SGI IP20, IP22, IP26, and IP28 machines.
*
diff --git a/include/asm-mips/sgint23.h b/include/asm-mips/sgi/sgint23.h
index ba889aee0..de98be6bc 100644
--- a/include/asm-mips/sgint23.h
+++ b/include/asm-mips/sgi/sgint23.h
@@ -1,4 +1,4 @@
-/* $Id: sgint23.h,v 1.4 1999/08/11 20:26:49 andrewb Exp $
+/* $Id: sgint23.h,v 1.5 1999/10/09 00:01:43 ralf Exp $
*
* sgint23.h: Defines for the SGI INT2 and INT3 chipsets.
*
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 15:16:33 +0000