diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-12 08:33:53 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-12 08:33:53 +0200 |
| commit | 17f04fbb0f7153d95ec33da81189b113cc778157 (patch) | |
| tree | 7f8f72195727d9d8b21040837996566bb4addf35 | |
| parent | sysctl: Use CONFIG_SPARC instead of __sparc__ for ifdef tests. (diff) | |
| download | linux-17f04fbb0f7153d95ec33da81189b113cc778157.tar.xz linux-17f04fbb0f7153d95ec33da81189b113cc778157.zip | |
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; 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/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" \ 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/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 @@ #include <linux/module.h> #include <linux/pm.h> +#include <asm/system.h> #include <asm/oplib.h> #include <asm/prom.h> 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; #endif #ifdef CONFIG_SPARC -extern char reboot_command []; -extern int stop_a_enabled; -extern int scons_pwroff; +#include <asm/system.h> #endif #ifdef __hppa__ |