diff --git a/[refs] b/[refs] index 457d5b1ee49d..bce70e1768d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47a460d5a307e639d6c9cdf9bb4857e2f5f3cb76 +refs/heads/master: 4ef7229ffa93695e346d510b871452811509ea65 diff --git a/trunk/include/linux/reboot.h b/trunk/include/linux/reboot.h index 85ea63f462af..b93b541cf111 100644 --- a/trunk/include/linux/reboot.h +++ b/trunk/include/linux/reboot.h @@ -59,8 +59,6 @@ extern void machine_crash_shutdown(struct pt_regs *); * Architecture independent implemenations of sys_reboot commands. */ -extern void kernel_shutdown_prepare(enum system_states state); - extern void kernel_restart(char *cmd); extern void kernel_halt(void); extern void kernel_power_off(void); diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c index 4162d12390b6..53de35fc8245 100644 --- a/trunk/kernel/sys.c +++ b/trunk/kernel/sys.c @@ -315,7 +315,7 @@ static void kernel_kexec(void) #endif } -void kernel_shutdown_prepare(enum system_states state) +static void kernel_shutdown_prepare(enum system_states state) { blocking_notifier_call_chain(&reboot_notifier_list, (state == SYSTEM_HALT)?SYS_HALT:SYS_POWER_OFF, NULL);