[patch] Re: 2.5.3[3,4] Preemption problem

[Robert Love]

On Mon, 2002-09-09 at 17:31, Paolo Ciarrocchi wrote:

> Halting system...
> Shutting down devices
> Power down.
> note: halt[15347] exited with preempt_count 1

I cooked up a patch... does this solve the problem (no more spurious
warning on reboot)?

Patch is against 2.5.34.

	Robert Love

diff -urN linux-2.5.34/kernel/sys.c linux/kernel/sys.c
--- linux-2.5.34/kernel/sys.c	Tue Sep 10 13:04:49 2002
+++ linux/kernel/sys.c	Tue Sep 10 15:40:35 2002
@@ -316,7 +316,7 @@
 
 	/* For safety, we require "magic" arguments. */
 	if (magic1 != LINUX_REBOOT_MAGIC1 ||
-	    (magic2 != LINUX_REBOOT_MAGIC2 && magic2 != LINUX_REBOOT_MAGIC2A &&
+	   (magic2 != LINUX_REBOOT_MAGIC2 && magic2 != LINUX_REBOOT_MAGIC2A &&
 			magic2 != LINUX_REBOOT_MAGIC2B))
 		return -EINVAL;
 
@@ -344,6 +344,7 @@
 		device_shutdown();
 		printk(KERN_EMERG "System halted.\n");
 		machine_halt();
+		unlock_kernel();
 		do_exit(0);
 		break;
 
@@ -353,6 +354,7 @@
 		device_shutdown();
 		printk(KERN_EMERG "Power down.\n");
 		machine_power_off();
+		unlock_kernel();
 		do_exit(0);
 		break;