arch/i386/kernel/apic.c   |    4 ++--
 arch/i386/kernel/reboot.c |    3 +++
 include/asm-i386/apic.h   |   10 ++--------
 include/linux/reboot.h    |    6 +++---
 4 files changed, 10 insertions(+), 13 deletions(-)

diff -puN include/linux/reboot.h~kexec-revert-NORET_TYPE include/linux/reboot.h
--- 25/include/linux/reboot.h~kexec-revert-NORET_TYPE	2003-05-13 22:36:38.000000000 -0700
+++ 25-akpm/include/linux/reboot.h	2003-05-13 22:43:03.000000000 -0700
@@ -45,9 +45,9 @@ extern int unregister_reboot_notifier(st
  * Architecture-specific implementations of sys_reboot commands.
  */
 
-NORET_TYPE void machine_restart(char *cmd) ATTRIB_NORET;
-NORET_TYPE void machine_halt(void) ATTRIB_NORET;
-NORET_TYPE void machine_power_off(void) ATTRIB_NORET;
+void machine_restart(char *cmd);
+void machine_halt(void);
+void machine_power_off(void);
 
 #endif
 
diff -puN arch/i386/kernel/reboot.c~kexec-revert-NORET_TYPE arch/i386/kernel/reboot.c
--- 25/arch/i386/kernel/reboot.c~kexec-revert-NORET_TYPE	2003-05-13 22:42:08.000000000 -0700
+++ 25-akpm/arch/i386/kernel/reboot.c	2003-05-13 22:45:47.000000000 -0700
@@ -243,6 +243,8 @@ static void machine_restart_1(void * __u
 	}
 
 	machine_real_restart(jump_to_bios, sizeof(jump_to_bios));
+	for ( ; ; )
+		;
 }
 void machine_restart(char * __unused)
 {
@@ -253,6 +255,7 @@ static void machine_halt_1(void * __unus
 {
 	stop_this_cpu();
 }
+
 void machine_halt(void)
 {
 	stop_apics(machine_halt_1, 0);
diff -puN arch/i386/kernel/apic.c~kexec-revert-NORET_TYPE arch/i386/kernel/apic.c
--- 25/arch/i386/kernel/apic.c~kexec-revert-NORET_TYPE	2003-05-13 22:42:17.000000000 -0700
+++ 25-akpm/arch/i386/kernel/apic.c	2003-05-13 22:49:17.000000000 -0700
@@ -1120,7 +1120,7 @@ asmlinkage void smp_error_interrupt(void
 
 
 struct stop_apics {
-	NORET_TYPE void (*rest)(void *info) ATTRIB_NORET;
+	void (*rest)(void *info);
 	void *info;
 	int reboot_cpu_id;
 };
@@ -1146,7 +1146,7 @@ static void cpu_stop_apics(void *ptr)
 	arg->rest(arg->info);
 }
 
-void stop_apics(NORET_TYPE void(*rest)(void *)ATTRIB_NORET, void *info)
+void stop_apics(void(*rest)(void *), void *info)
 {
 	/* By resetting the APIC's we disable the nmi watchdog */
 	extern int reboot_cpu;
diff -puN include/asm-i386/apic.h~kexec-revert-NORET_TYPE include/asm-i386/apic.h
--- 25/include/asm-i386/apic.h~kexec-revert-NORET_TYPE	2003-05-13 22:47:48.000000000 -0700
+++ 25-akpm/include/asm-i386/apic.h	2003-05-13 22:48:39.000000000 -0700
@@ -100,15 +100,9 @@ extern unsigned int nmi_watchdog;
 #define NMI_LOCAL_APIC	2
 #define NMI_INVALID	3
 
-extern NORET_TYPE void 
-stop_apics(NORET_TYPE void (*rest)(void *info) ATTRIB_NORET, void *info) 
-ATTRIB_NORET;
+extern void stop_apics(void (*rest)(void *info), void *info);
 #else
-static inline NORET_TYPE void 
-stop_apics(NORET_TYPE void (*rest)(void *info) ATTRIB_NORET, void *info)
-ATTRIB_NORET;
-static inline void 
-stop_apics(NORET_TYPE void (*rest)(void *info) ATTRIB_NORET, void *info)
+static inline void stop_apics(void (*rest)(void *info), void *info)
 {
 	rest(info); 
 }

_