diff options
Diffstat (limited to 'arch/s390/kernel/setup.c')
-rw-r--r-- | arch/s390/kernel/setup.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index b6d740ac0e6e..5ba5a5485da9 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c | |||
@@ -299,24 +299,18 @@ void machine_restart(char *command) | |||
299 | _machine_restart(command); | 299 | _machine_restart(command); |
300 | } | 300 | } |
301 | 301 | ||
302 | EXPORT_SYMBOL(machine_restart); | ||
303 | |||
304 | void machine_halt(void) | 302 | void machine_halt(void) |
305 | { | 303 | { |
306 | console_unblank(); | 304 | console_unblank(); |
307 | _machine_halt(); | 305 | _machine_halt(); |
308 | } | 306 | } |
309 | 307 | ||
310 | EXPORT_SYMBOL(machine_halt); | ||
311 | |||
312 | void machine_power_off(void) | 308 | void machine_power_off(void) |
313 | { | 309 | { |
314 | console_unblank(); | 310 | console_unblank(); |
315 | _machine_power_off(); | 311 | _machine_power_off(); |
316 | } | 312 | } |
317 | 313 | ||
318 | EXPORT_SYMBOL(machine_power_off); | ||
319 | |||
320 | static void __init | 314 | static void __init |
321 | add_memory_hole(unsigned long start, unsigned long end) | 315 | add_memory_hole(unsigned long start, unsigned long end) |
322 | { | 316 | { |
@@ -437,12 +431,6 @@ setup_lowcore(void) | |||
437 | ctl_set_bit(14, 29); | 431 | ctl_set_bit(14, 29); |
438 | } | 432 | } |
439 | #endif | 433 | #endif |
440 | #ifdef CONFIG_ARCH_S390X | ||
441 | if (MACHINE_HAS_DIAG44) | ||
442 | lc->diag44_opcode = 0x83000044; | ||
443 | else | ||
444 | lc->diag44_opcode = 0x07000700; | ||
445 | #endif /* CONFIG_ARCH_S390X */ | ||
446 | set_prefix((u32)(unsigned long) lc); | 434 | set_prefix((u32)(unsigned long) lc); |
447 | } | 435 | } |
448 | 436 | ||