The patch titled x86/apbt: conditionally register cpu hp notifier for apbt has been added to the -mm tree. Its filename is x86-apbt-conditionally-register-cpu-hp-notifier-for-apbt.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: x86/apbt: conditionally register cpu hp notifier for apbt From: Jacob Pan <jacob.jun.pan@xxxxxxxxxxxxxxx> APB timer is used on Moorestown platforms but not on a standard PC. If APB timer code is compiled in but not initialized at run-time due to lack of FW reported SFI table, kernel would panic when the non-boot CPUs are offlined and notifier is called. This patch ensures CPU hotplug notifier for APB timer is only registered when the APBT timer block is initialized. Addresses https://bugzilla.kernel.org/show_bug.cgi?id=15786 Signed-off-by: Jacob Pan <jacob.jun.pan@xxxxxxxxxxxxxxx> Reported-by: Andreas Jaeger <jaegerandi@xxxxxxxxx> Tested-by: Andreas Jaeger <jaegerandi@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/kernel/apb_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/x86/kernel/apb_timer.c~x86-apbt-conditionally-register-cpu-hp-notifier-for-apbt arch/x86/kernel/apb_timer.c --- a/arch/x86/kernel/apb_timer.c~x86-apbt-conditionally-register-cpu-hp-notifier-for-apbt +++ a/arch/x86/kernel/apb_timer.c @@ -429,7 +429,7 @@ static int apbt_cpuhp_notify(struct noti static __init int apbt_late_init(void) { - if (disable_apbt_percpu) + if (disable_apbt_percpu || !apb_timer_block_enabled) return 0; /* This notifier should be called after workqueue is ready */ hotcpu_notifier(apbt_cpuhp_notify, -20); _ Patches currently in -mm which might be from jacob.jun.pan@xxxxxxxxxxxxxxx are x86-apbt-conditionally-register-cpu-hp-notifier-for-apbt.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html