From: Alan Stern Notifier chain re-implementation (as639b): Change the remaining places that refer to functions from the old API over to the new API. Signed-off-by: Alan Stern Signed-off-by: Chandra Seetharaman Signed-off-by: Andrew Morton --- arch/arm/mach-omap1/board-netstar.c | 2 +- arch/arm/mach-omap1/board-voiceblue.c | 2 +- arch/mips/lasat/setup.c | 3 ++- arch/mips/sgi-ip22/ip22-reset.c | 2 +- arch/mips/sgi-ip32/ip32-reset.c | 2 +- arch/parisc/kernel/pdc_chassis.c | 3 ++- arch/powerpc/kernel/setup_64.c | 3 ++- arch/ppc/platforms/prep_setup.c | 2 +- arch/um/drivers/mconsole_kern.c | 3 ++- arch/um/kernel/um_arch.c | 3 ++- arch/xtensa/platform-iss/setup.c | 2 +- drivers/char/ipmi/ipmi_msghandler.c | 4 ++-- drivers/char/ipmi/ipmi_watchdog.c | 6 ++++-- drivers/misc/ibmasm/heartbeat.c | 5 +++-- drivers/parisc/power.c | 6 ++++-- kernel/softlockup.c | 2 +- 16 files changed, 30 insertions(+), 20 deletions(-) diff -puN arch/arm/mach-omap1/board-netstar.c~notifier-chain-update-remaining-changes-for-new-api arch/arm/mach-omap1/board-netstar.c --- devel/arch/arm/mach-omap1/board-netstar.c~notifier-chain-update-remaining-changes-for-new-api 2006-02-27 20:58:53.000000000 -0800 +++ devel-akpm/arch/arm/mach-omap1/board-netstar.c 2006-02-27 20:58:53.000000000 -0800 @@ -141,7 +141,7 @@ static int __init netstar_late_init(void /* TODO: Setup front panel switch here */ /* Setup panic notifier */ - notifier_chain_register(&panic_notifier_list, &panic_block); + atomic_notifier_chain_register(&panic_notifier_list, &panic_block); return 0; } diff -puN arch/arm/mach-omap1/board-voiceblue.c~notifier-chain-update-remaining-changes-for-new-api arch/arm/mach-omap1/board-voiceblue.c --- devel/arch/arm/mach-omap1/board-voiceblue.c~notifier-chain-update-remaining-changes-for-new-api 2006-02-27 20:58:53.000000000 -0800 +++ devel-akpm/arch/arm/mach-omap1/board-voiceblue.c 2006-02-27 20:58:53.000000000 -0800 @@ -235,7 +235,7 @@ static struct notifier_block panic_block static int __init voiceblue_setup(void) { /* Setup panic notifier */ - notifier_chain_register(&panic_notifier_list, &panic_block); + atomic_notifier_chain_register(&panic_notifier_list, &panic_block); return 0; } diff -puN arch/mips/lasat/setup.c~notifier-chain-update-remaining-changes-for-new-api arch/mips/lasat/setup.c --- devel/arch/mips/lasat/setup.c~notifier-chain-update-remaining-changes-for-new-api 2006-02-27 20:58:53.000000000 -0800 +++ devel-akpm/arch/mips/lasat/setup.c 2006-02-27 20:58:53.000000000 -0800 @@ -165,7 +165,8 @@ void __init plat_setup(void) /* Set up panic notifier */ for (i = 0; i < sizeof(lasat_panic_block) / sizeof(struct notifier_block); i++) - notifier_chain_register(&panic_notifier_list, &lasat_panic_block[i]); + atomic_notifier_chain_register(&panic_notifier_list, + &lasat_panic_block[i]); lasat_reboot_setup(); diff -puN arch/mips/sgi-ip22/ip22-reset.c~notifier-chain-update-remaining-changes-for-new-api arch/mips/sgi-ip22/ip22-reset.c --- devel/arch/mips/sgi-ip22/ip22-reset.c~notifier-chain-update-remaining-changes-for-new-api 2006-02-27 20:58:53.000000000 -0800 +++ devel-akpm/arch/mips/sgi-ip22/ip22-reset.c 2006-02-27 20:58:53.000000000 -0800 @@ -238,7 +238,7 @@ static int __init reboot_setup(void) request_irq(SGI_PANEL_IRQ, panel_int, 0, "Front Panel", NULL); init_timer(&blink_timer); blink_timer.function = blink_timeout; - notifier_chain_register(&panic_notifier_list, &panic_block); + atomic_notifier_chain_register(&panic_notifier_list, &panic_block); return 0; } diff -puN arch/mips/sgi-ip32/ip32-reset.c~notifier-chain-update-remaining-changes-for-new-api arch/mips/sgi-ip32/ip32-reset.c --- devel/arch/mips/sgi-ip32/ip32-reset.c~notifier-chain-update-remaining-changes-for-new-api 2006-02-27 20:58:53.000000000 -0800 +++ devel-akpm/arch/mips/sgi-ip32/ip32-reset.c 2006-02-27 20:58:53.000000000 -0800 @@ -193,7 +193,7 @@ static __init int ip32_reboot_setup(void init_timer(&blink_timer); blink_timer.function = blink_timeout; - notifier_chain_register(&panic_notifier_list, &panic_block); + atomic_notifier_chain_register(&panic_notifier_list, &panic_block); request_irq(MACEISA_RTC_IRQ, ip32_rtc_int, 0, "rtc", NULL); diff -puN arch/parisc/kernel/pdc_chassis.c~notifier-chain-update-remaining-changes-for-new-api arch/parisc/kernel/pdc_chassis.c --- devel/arch/parisc/kernel/pdc_chassis.c~notifier-chain-update-remaining-changes-for-new-api 2006-02-27 20:58:53.000000000 -0800 +++ devel-akpm/arch/parisc/kernel/pdc_chassis.c 2006-02-27 20:58:53.000000000 -0800 @@ -150,7 +150,8 @@ void __init parisc_pdc_chassis_init(void if (handle) { /* initialize panic notifier chain */ - notifier_chain_register(&panic_notifier_list, &pdc_chassis_panic_block); + atomic_notifier_chain_register(&panic_notifier_list, + &pdc_chassis_panic_block); /* initialize reboot notifier chain */ register_reboot_notifier(&pdc_chassis_reboot_block); diff -puN arch/powerpc/kernel/setup_64.c~notifier-chain-update-remaining-changes-for-new-api arch/powerpc/kernel/setup_64.c --- devel/arch/powerpc/kernel/setup_64.c~notifier-chain-update-remaining-changes-for-new-api 2006-02-27 20:58:53.000000000 -0800 +++ devel-akpm/arch/powerpc/kernel/setup_64.c 2006-02-27 20:58:53.000000000 -0800 @@ -581,7 +581,8 @@ void __init setup_arch(char **cmdline_p) panic_timeout = 180; if (ppc_md.panic) - notifier_chain_register(&panic_notifier_list, &ppc64_panic_block); + atomic_notifier_chain_register(&panic_notifier_list, + &ppc64_panic_block); init_mm.start_code = PAGE_OFFSET; init_mm.end_code = (unsigned long) _etext; diff -puN arch/ppc/platforms/prep_setup.c~notifier-chain-update-remaining-changes-for-new-api arch/ppc/platforms/prep_setup.c --- devel/arch/ppc/platforms/prep_setup.c~notifier-chain-update-remaining-changes-for-new-api 2006-02-27 20:58:53.000000000 -0800 +++ devel-akpm/arch/ppc/platforms/prep_setup.c 2006-02-27 20:58:53.000000000 -0800 @@ -736,7 +736,7 @@ ibm_statusled_progress(char *s, unsigned hex = 0xfff; if (!notifier_installed) { ++notifier_installed; - notifier_chain_register(&panic_notifier_list, + atomic_notifier_chain_register(&panic_notifier_list, &ibm_statusled_block); } } diff -puN arch/um/drivers/mconsole_kern.c~notifier-chain-update-remaining-changes-for-new-api arch/um/drivers/mconsole_kern.c --- devel/arch/um/drivers/mconsole_kern.c~notifier-chain-update-remaining-changes-for-new-api 2006-02-27 20:58:53.000000000 -0800 +++ devel-akpm/arch/um/drivers/mconsole_kern.c 2006-02-27 20:58:53.000000000 -0800 @@ -762,7 +762,8 @@ static struct notifier_block panic_exit_ static int add_notifier(void) { - notifier_chain_register(&panic_notifier_list, &panic_exit_notifier); + atomic_notifier_chain_register(&panic_notifier_list, + &panic_exit_notifier); return(0); } diff -puN arch/um/kernel/um_arch.c~notifier-chain-update-remaining-changes-for-new-api arch/um/kernel/um_arch.c --- devel/arch/um/kernel/um_arch.c~notifier-chain-update-remaining-changes-for-new-api 2006-02-27 20:58:53.000000000 -0800 +++ devel-akpm/arch/um/kernel/um_arch.c 2006-02-27 20:58:53.000000000 -0800 @@ -477,7 +477,8 @@ static struct notifier_block panic_exit_ void __init setup_arch(char **cmdline_p) { - notifier_chain_register(&panic_notifier_list, &panic_exit_notifier); + atomic_notifier_chain_register(&panic_notifier_list, + &panic_exit_notifier); paging_init(); strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE); *cmdline_p = command_line; diff -puN arch/xtensa/platform-iss/setup.c~notifier-chain-update-remaining-changes-for-new-api arch/xtensa/platform-iss/setup.c --- devel/arch/xtensa/platform-iss/setup.c~notifier-chain-update-remaining-changes-for-new-api 2006-02-27 20:58:53.000000000 -0800 +++ devel-akpm/arch/xtensa/platform-iss/setup.c 2006-02-27 20:58:53.000000000 -0800 @@ -108,5 +108,5 @@ static struct notifier_block iss_panic_b void __init platform_setup(char **p_cmdline) { - notifier_chain_register(&panic_notifier_list, &iss_panic_block); + atomic_notifier_chain_register(&panic_notifier_list, &iss_panic_block); } diff -puN drivers/char/ipmi/ipmi_msghandler.c~notifier-chain-update-remaining-changes-for-new-api drivers/char/ipmi/ipmi_msghandler.c --- devel/drivers/char/ipmi/ipmi_msghandler.c~notifier-chain-update-remaining-changes-for-new-api 2006-02-27 20:58:53.000000000 -0800 +++ devel-akpm/drivers/char/ipmi/ipmi_msghandler.c 2006-02-27 20:58:53.000000000 -0800 @@ -3220,7 +3220,7 @@ static int ipmi_init_msghandler(void) ipmi_timer.expires = jiffies + IPMI_TIMEOUT_JIFFIES; add_timer(&ipmi_timer); - notifier_chain_register(&panic_notifier_list, &panic_block); + atomic_notifier_chain_register(&panic_notifier_list, &panic_block); initialized = 1; @@ -3240,7 +3240,7 @@ static __exit void cleanup_ipmi(void) if (!initialized) return; - notifier_chain_unregister(&panic_notifier_list, &panic_block); + atomic_notifier_chain_unregister(&panic_notifier_list, &panic_block); /* This can't be called if any interfaces exist, so no worry about shutting down the interfaces. */ diff -puN drivers/char/ipmi/ipmi_watchdog.c~notifier-chain-update-remaining-changes-for-new-api drivers/char/ipmi/ipmi_watchdog.c --- devel/drivers/char/ipmi/ipmi_watchdog.c~notifier-chain-update-remaining-changes-for-new-api 2006-02-27 20:58:53.000000000 -0800 +++ devel-akpm/drivers/char/ipmi/ipmi_watchdog.c 2006-02-27 20:58:53.000000000 -0800 @@ -1158,7 +1158,8 @@ static int __init ipmi_wdog_init(void) } register_reboot_notifier(&wdog_reboot_notifier); - notifier_chain_register(&panic_notifier_list, &wdog_panic_notifier); + atomic_notifier_chain_register(&panic_notifier_list, + &wdog_panic_notifier); printk(KERN_INFO PFX "driver initialized\n"); @@ -1176,7 +1177,8 @@ static __exit void ipmi_unregister_watch release_nmi(&ipmi_nmi_handler); #endif - notifier_chain_unregister(&panic_notifier_list, &wdog_panic_notifier); + atomic_notifier_chain_unregister(&panic_notifier_list, + &wdog_panic_notifier); unregister_reboot_notifier(&wdog_reboot_notifier); if (! watchdog_user) diff -puN drivers/misc/ibmasm/heartbeat.c~notifier-chain-update-remaining-changes-for-new-api drivers/misc/ibmasm/heartbeat.c --- devel/drivers/misc/ibmasm/heartbeat.c~notifier-chain-update-remaining-changes-for-new-api 2006-02-27 20:58:53.000000000 -0800 +++ devel-akpm/drivers/misc/ibmasm/heartbeat.c 2006-02-27 20:58:53.000000000 -0800 @@ -52,12 +52,13 @@ static struct notifier_block panic_notif void ibmasm_register_panic_notifier(void) { - notifier_chain_register(&panic_notifier_list, &panic_notifier); + atomic_notifier_chain_register(&panic_notifier_list, &panic_notifier); } void ibmasm_unregister_panic_notifier(void) { - notifier_chain_unregister(&panic_notifier_list, &panic_notifier); + atomic_notifier_chain_unregister(&panic_notifier_list, + &panic_notifier); } diff -puN drivers/parisc/power.c~notifier-chain-update-remaining-changes-for-new-api drivers/parisc/power.c --- devel/drivers/parisc/power.c~notifier-chain-update-remaining-changes-for-new-api 2006-02-27 20:58:53.000000000 -0800 +++ devel-akpm/drivers/parisc/power.c 2006-02-27 20:58:53.000000000 -0800 @@ -251,7 +251,8 @@ static int __init power_init(void) } /* Register a call for panic conditions. */ - notifier_chain_register(&panic_notifier_list, &parisc_panic_block); + atomic_notifier_chain_register(&panic_notifier_list, + &parisc_panic_block); tasklet_enable(&power_tasklet); @@ -264,7 +265,8 @@ static void __exit power_exit(void) return; tasklet_disable(&power_tasklet); - notifier_chain_unregister(&panic_notifier_list, &parisc_panic_block); + atomic_notifier_chain_unregister(&panic_notifier_list, + &parisc_panic_block); power_tasklet.func = NULL; pdc_soft_power_button(0); } diff -puN kernel/softlockup.c~notifier-chain-update-remaining-changes-for-new-api kernel/softlockup.c --- devel/kernel/softlockup.c~notifier-chain-update-remaining-changes-for-new-api 2006-02-27 20:58:53.000000000 -0800 +++ devel-akpm/kernel/softlockup.c 2006-02-27 20:58:53.000000000 -0800 @@ -152,5 +152,5 @@ __init void spawn_softlockup_task(void) cpu_callback(&cpu_nfb, CPU_ONLINE, cpu); register_cpu_notifier(&cpu_nfb); - notifier_chain_register(&panic_notifier_list, &panic_block); + atomic_notifier_chain_register(&panic_notifier_list, &panic_block); } _