aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/setup.c
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2007-02-05 15:16:47 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-02-05 15:16:47 -0500
commit2b67fc46061b2171fb8fbb55d1ac717abd533569 (patch)
treed4e9db6e7d51d2fc3cf782bf11e24ed7fbc544a0 /arch/s390/kernel/setup.c
parent55dff5224abeb734b12c1661c34ccf534955bee7 (diff)
[S390] Get rid of a lot of sparse warnings.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/setup.c')
-rw-r--r--arch/s390/kernel/setup.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 5d8ee3baac14..1cbf956cb6b3 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -38,6 +38,7 @@
38#include <linux/device.h> 38#include <linux/device.h>
39#include <linux/notifier.h> 39#include <linux/notifier.h>
40#include <linux/pfn.h> 40#include <linux/pfn.h>
41#include <linux/reboot.h>
41 42
42#include <asm/uaccess.h> 43#include <asm/uaccess.h>
43#include <asm/system.h> 44#include <asm/system.h>
@@ -117,7 +118,7 @@ void __devinit cpu_init (void)
117 */ 118 */
118char vmhalt_cmd[128] = ""; 119char vmhalt_cmd[128] = "";
119char vmpoff_cmd[128] = ""; 120char vmpoff_cmd[128] = "";
120char vmpanic_cmd[128] = ""; 121static char vmpanic_cmd[128] = "";
121 122
122static inline void strncpy_skip_quote(char *dst, char *src, int n) 123static inline void strncpy_skip_quote(char *dst, char *src, int n)
123{ 124{
@@ -275,10 +276,6 @@ static void __init conmode_default(void)
275} 276}
276 277
277#ifdef CONFIG_SMP 278#ifdef CONFIG_SMP
278extern void machine_restart_smp(char *);
279extern void machine_halt_smp(void);
280extern void machine_power_off_smp(void);
281
282void (*_machine_restart)(char *command) = machine_restart_smp; 279void (*_machine_restart)(char *command) = machine_restart_smp;
283void (*_machine_halt)(void) = machine_halt_smp; 280void (*_machine_halt)(void) = machine_halt_smp;
284void (*_machine_power_off)(void) = machine_power_off_smp; 281void (*_machine_power_off)(void) = machine_power_off_smp;