From: Andrew Morton arch/i386/kernel/reboot.c: In function 'acpi_disable': arch/i386/kernel/reboot.c:37: warning: control reaches end of non-void function Also, - extern decls never ever ever go in .c files. - The !CONFIG_ACPI stub should be inline - The !CONFIG_ACPI stub should be in a header file - The !CONFIG_ACPI stub has an extra (and buggy) semicolon. - The extra blank line in machine_emergency_restart() is unwelcome. Cc: "Brown, Len" Cc: "Yu, Luming" Signed-off-by: Andrew Morton --- arch/i386/kernel/reboot.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff -puN arch/i386/kernel/reboot.c~acpi-asus-s3-resume-fix-fix arch/i386/kernel/reboot.c --- a/arch/i386/kernel/reboot.c~acpi-asus-s3-resume-fix-fix +++ a/arch/i386/kernel/reboot.c @@ -34,7 +34,10 @@ static int reboot_cpu = -1; #ifdef CONFIG_ACPI extern u32 acpi_disable(void); #else -static u32 acpi_disable(void){}; +static u32 acpi_disable(void) +{ + return 0; +}; #endif static int __init reboot_setup(char *str) _