---

yaml --- r: 113127 b: refs/heads/master c: 17f04fb h: refs/heads/master i: 113125: acd34db 113123: 55ae650 113119: 701b5a0 v: v3
git-mirror · Sep 12, 2008 · 840624d · 840624d
1 parent e9f6182
commit 840624d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72c57ed50663dc04b0b329beaec39b557c8ac5a5
+refs/heads/master: 17f04fbb0f7153d95ec33da81189b113cc778157
diff --git a/trunk/arch/sparc/include/asm/system_32.h b/trunk/arch/sparc/include/asm/system_32.h
@@ -49,6 +49,7 @@ extern unsigned long empty_zero_page;
 extern void sun_do_break(void);
 extern int serial_console;
 extern int stop_a_enabled;
+extern int scons_pwroff;
 
 static inline int con_is_present(void)
 {

diff --git a/trunk/arch/sparc/include/asm/system_64.h b/trunk/arch/sparc/include/asm/system_64.h
@@ -117,6 +117,7 @@ do {	__asm__ __volatile__("ba,pt	%%xcc, 1f\n\t" \
 
 extern void sun_do_break(void);
 extern int stop_a_enabled;
+extern int scons_pwroff;
 
 extern void fault_in_user_windows(void);
 extern void synchronize_user_stack(void);

diff --git a/trunk/arch/sparc64/kernel/reboot.c b/trunk/arch/sparc64/kernel/reboot.c
@@ -7,6 +7,7 @@
 #include <linux/module.h>
 #include <linux/pm.h>
 
+#include <asm/system.h>
 #include <asm/oplib.h>
 #include <asm/prom.h>
 

diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
@@ -119,9 +119,7 @@ extern int sg_big_buff;
 #endif
 
 #ifdef CONFIG_SPARC
-extern char reboot_command [];
-extern int stop_a_enabled;
-extern int scons_pwroff;
+#include <asm/system.h>
 #endif
 
 #ifdef __hppa__