diff options
author | David S. Miller <davem@davemloft.net> | 2008-09-12 02:33:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-09-12 02:33:53 -0400 |
commit | 17f04fbb0f7153d95ec33da81189b113cc778157 (patch) | |
tree | 7f8f72195727d9d8b21040837996566bb4addf35 | |
parent | 72c57ed50663dc04b0b329beaec39b557c8ac5a5 (diff) |
sysctl: Use header file for sysctl knob declarations on sparc.
This also takes care of a sparse warning as scons_pwroff's definition
point.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc/include/asm/system_32.h | 1 | ||||
-rw-r--r-- | arch/sparc/include/asm/system_64.h | 1 | ||||
-rw-r--r-- | arch/sparc64/kernel/reboot.c | 1 | ||||
-rw-r--r-- | kernel/sysctl.c | 4 |
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; | |||
49 | extern void sun_do_break(void); | 49 | extern void sun_do_break(void); |
50 | extern int serial_console; | 50 | extern int serial_console; |
51 | extern int stop_a_enabled; | 51 | extern int stop_a_enabled; |
52 | extern int scons_pwroff; | ||
52 | 53 | ||
53 | static inline int con_is_present(void) | 54 | static 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 | ||
118 | extern void sun_do_break(void); | 118 | extern void sun_do_break(void); |
119 | extern int stop_a_enabled; | 119 | extern int stop_a_enabled; |
120 | extern int scons_pwroff; | ||
120 | 121 | ||
121 | extern void fault_in_user_windows(void); | 122 | extern void fault_in_user_windows(void); |
122 | extern void synchronize_user_stack(void); | 123 | extern 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 |
122 | extern char reboot_command []; | 122 | #include <asm/system.h> |
123 | extern int stop_a_enabled; | ||
124 | extern int scons_pwroff; | ||
125 | #endif | 123 | #endif |
126 | 124 | ||
127 | #ifdef __hppa__ | 125 | #ifdef __hppa__ |