Turn on (and fix) do_initcalls so page scrub init

ChangeSet 1.1364, 2005/03/24 19:19:24-07:00, djm@xxxxxxxxxxxxxxxxxx

        Turn on (and fix) do_initcalls so page scrub init
        is called... otherwise page scrub softirq causes null
        pointer deref



 arch/ia64/xensetup.c    |    9 +++++++--
 include/asm-ia64/init.h |    2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)


diff -Nru a/xen/arch/ia64/xensetup.c b/xen/arch/ia64/xensetup.c
--- a/xen/arch/ia64/xensetup.c  2005-03-25 19:05:49 -05:00
+++ b/xen/arch/ia64/xensetup.c  2005-03-25 19:05:49 -05:00
@@ -140,7 +140,12 @@
     return 0;
 }
 
-
+static void __init do_initcalls(void)
+{
+    initcall_t *call;
+    for ( call = &__initcall_start; call < &__initcall_end; call++ )
+        (*call)();
+}
 
 void cmain(multiboot_info_t *mbi)
 {
@@ -240,7 +245,7 @@
     ac_timer_init();
 // init_xen_time(); ???
     schedulers_start();
-// do_initcalls(); ???
+    do_initcalls();
 printk("About to call sort_main_extable()\n");
     sort_main_extable();
 
diff -Nru a/xen/include/asm-ia64/init.h b/xen/include/asm-ia64/init.h
--- a/xen/include/asm-ia64/init.h       2005-03-25 19:05:49 -05:00
+++ b/xen/include/asm-ia64/init.h       2005-03-25 19:05:49 -05:00
@@ -16,7 +16,7 @@
 #define __initsetup  \
     __attribute_used__ __attribute__ ((__section__ (".setup.init")))
 #define __init_call  \
-    __attribute_used__ __attribute__ ((__section__ (".initcall.init")))
+    __attribute_used__ __attribute__ ((__section__ (".initcall1.init")))
 #define __exit_call  \
     __attribute_used__ __attribute__ ((__section__ (".exitcall.exit")))
 


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click