diff options
author | David S. Miller <davem@davemloft.net> | 2008-02-19 23:39:18 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-19 23:39:18 -0500 |
commit | c3c25240312d92a088a9981b620e876e960313f8 (patch) | |
tree | f6ebee3cbbc76c0327e12099750da100d8a7fe9f | |
parent | f6d091e05199e67ba79c3ea29faa5c3b51d5daf4 (diff) |
[SPARC64]: Fix sparse warnings wrt. machine_alt_power_off().
arch/sparc64/kernel/process.c:123:6: warning: symbol 'machine_alt_power_off' was not declared. Should it be static?
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc64/kernel/power.c | 3 | ||||
-rw-r--r-- | arch/sparc64/kernel/process.c | 1 | ||||
-rw-r--r-- | include/asm-sparc64/reboot.h | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c index 850cdffdd69c..eae8ca2a6ba5 100644 --- a/arch/sparc64/kernel/power.c +++ b/arch/sparc64/kernel/power.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <asm/of_device.h> | 20 | #include <asm/of_device.h> |
21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
22 | #include <asm/sstate.h> | 22 | #include <asm/sstate.h> |
23 | #include <asm/reboot.h> | ||
23 | 24 | ||
24 | #include <linux/unistd.h> | 25 | #include <linux/unistd.h> |
25 | 26 | ||
@@ -39,8 +40,6 @@ static irqreturn_t power_handler(int irq, void *dev_id) | |||
39 | return IRQ_HANDLED; | 40 | return IRQ_HANDLED; |
40 | } | 41 | } |
41 | 42 | ||
42 | extern void machine_halt(void); | ||
43 | extern void machine_alt_power_off(void); | ||
44 | static void (*poweroff_method)(void) = machine_alt_power_off; | 43 | static void (*poweroff_method)(void) = machine_alt_power_off; |
45 | 44 | ||
46 | void machine_power_off(void) | 45 | void machine_power_off(void) |
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c index 6eceac51ae62..75c1408a664f 100644 --- a/arch/sparc64/kernel/process.c +++ b/arch/sparc64/kernel/process.c | |||
@@ -47,6 +47,7 @@ | |||
47 | #include <asm/unistd.h> | 47 | #include <asm/unistd.h> |
48 | #include <asm/hypervisor.h> | 48 | #include <asm/hypervisor.h> |
49 | #include <asm/sstate.h> | 49 | #include <asm/sstate.h> |
50 | #include <asm/reboot.h> | ||
50 | 51 | ||
51 | /* #define VERBOSE_SHOWREGS */ | 52 | /* #define VERBOSE_SHOWREGS */ |
52 | 53 | ||
diff --git a/include/asm-sparc64/reboot.h b/include/asm-sparc64/reboot.h new file mode 100644 index 000000000000..3f3f43f5be5e --- /dev/null +++ b/include/asm-sparc64/reboot.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _SPARC64_REBOOT_H | ||
2 | #define _SPARC64_REBOOT_H | ||
3 | |||
4 | extern void machine_alt_power_off(void); | ||
5 | |||
6 | #endif /* _SPARC64_REBOOT_H */ | ||