aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/sparc/include/asm/system_32.h1
-rw-r--r--arch/sparc/include/asm/system_64.h1
-rw-r--r--arch/sparc64/kernel/reboot.c1
-rw-r--r--kernel/sysctl.c4
4 files changed, 4 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/system_32.h b/arch/sparc/include/asm/system_32.h
index 4e18ef272336..8623fc48fe24 100644
--- a/arch/sparc/include/asm/system_32.h
+++ b/arch/sparc/include/asm/system_32.h
@@ -49,6 +49,7 @@ extern unsigned long empty_zero_page;
49extern void sun_do_break(void); 49extern void sun_do_break(void);
50extern int serial_console; 50extern int serial_console;
51extern int stop_a_enabled; 51extern int stop_a_enabled;
52extern int scons_pwroff;
52 53
53static inline int con_is_present(void) 54static inline int con_is_present(void)
54{ 55{
diff --git a/arch/sparc/include/asm/system_64.h b/arch/sparc/include/asm/system_64.h
index 98acb3b9d4a1..8759f2a1b837 100644
--- a/arch/sparc/include/asm/system_64.h
+++ b/arch/sparc/include/asm/system_64.h
@@ -117,6 +117,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
117 117
118extern void sun_do_break(void); 118extern void sun_do_break(void);
119extern int stop_a_enabled; 119extern int stop_a_enabled;
120extern int scons_pwroff;
120 121
121extern void fault_in_user_windows(void); 122extern void fault_in_user_windows(void);
122extern void synchronize_user_stack(void); 123extern void synchronize_user_stack(void);
diff --git a/arch/sparc64/kernel/reboot.c b/arch/sparc64/kernel/reboot.c
index 11f249660630..ef89d3d69748 100644
--- a/arch/sparc64/kernel/reboot.c
+++ b/arch/sparc64/kernel/reboot.c
@@ -7,6 +7,7 @@
7#include <linux/module.h> 7#include <linux/module.h>
8#include <linux/pm.h> 8#include <linux/pm.h>
9 9
10#include <asm/system.h>
10#include <asm/oplib.h> 11#include <asm/oplib.h>
11#include <asm/prom.h> 12#include <asm/prom.h>
12 13
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index eda6162c58f2..da5152088cc3 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -119,9 +119,7 @@ extern int sg_big_buff;
119#endif 119#endif
120 120
121#ifdef CONFIG_SPARC 121#ifdef CONFIG_SPARC
122extern char reboot_command []; 122#include <asm/system.h>
123extern int stop_a_enabled;
124extern int scons_pwroff;
125#endif 123#endif
126 124
127#ifdef __hppa__ 125#ifdef __hppa__