Move various headers into a SGI specific subdirectory. These files

need to be at the same place for MIPS32 and MIPS64.  Make the semaphore
code actually compile.

5 files changed, 8 insertions, 6 deletions

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.
  *