[Adeos-main] [PATCH] 2.6.19: Fix irq_disable in early start_kernel

[Jan Kiszka <jan.kiszka@domain.hid>]

[-- Attachment #1.1: Type: text/plain, Size: 1313 bytes --]

Hi Philippe,

this was a nice bug: After applying some totally unrelated cleanup patch
that removes a few useless EXPORT_SYMBOLS from ipipe, I got this during
boot:

...
Xenomai: hal/x86 started.
BUG: unable to handle kernel NULL pointer dereference at virtual address
000000f1
...
EIP is at kref_get+0x9/0x43
...
Call Trace:
 [<c020e077>] kobject_get+0x12/0x17
 [<c01c28ae>] sysfs_create_link+0xda/0x140
 [<c02412bb>] class_device_add+0x217/0x3dc
 [<c0241492>] class_device_register+0x12/0x15
 [<c0241519>] class_device_create+0x84/0xa5
 [<c022fe47>] misc_register+0x109/0x140
 [<c0142748>] xnheap_mount+0x9a/0xa2
 [<c03fad0c>] __xeno_sys_init+0xd9/0x15d
 [<c01004d0>] init+0x127/0x2dc
 [<c0103e97>] kernel_thread_helper+0x7/0x10

The reason: xnheap_dev.dev=1!? But that field is located untouched in a
static structure, i.e. *must* be 0! Interrupting the kernel shortly
after boot already returned it as 1. Finally, after breaking at the
beginning of start_kernel, I got the expected 0 and then quickly found
the messed-up piece of code a few lines below.

Please apply attached patch, I suspect it is a typo (ipipe isn't
initialised at this point to handle such requests, so the stall bit
ended up in xnheap_dev for me - who knows what can happen on other
setups...).

Jan

[-- Attachment #1.2: fix-irq_disable-in-start_kernel.patch --]
[-- Type: text/plain, Size: 465 bytes --]

---
 init/main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.19/init/main.c
===================================================================
--- linux-2.6.19.orig/init/main.c
+++ linux-2.6.19/init/main.c
@@ -489,7 +489,7 @@ asmlinkage void __init start_kernel(void
 	unwind_init();
 	lockdep_init();
 
-	local_irq_disable_head();
+	local_irq_disable_hw();
 	early_boot_irqs_off();
 	early_init_irq_lock_class();
 

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 250 bytes --]