The patch titled x86: convert cpu notifier to return encapsulate errno value has been added to the -mm tree. Its filename is x86-convert-cpu-notifier-to-return-encapsulate-errno-value.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: convert cpu notifier to return encapsulate errno value From: Akinobu Mita <akinobu.mita@xxxxxxxxx> By the previous modification, the cpu notifier can return encapsulate errno value. This converts the cpu notifiers for msr, cpuid, and therm_throt. Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/kernel/cpu/mcheck/therm_throt.c | 2 +- arch/x86/kernel/cpuid.c | 2 +- arch/x86/kernel/msr.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff -puN arch/x86/kernel/cpu/mcheck/therm_throt.c~x86-convert-cpu-notifier-to-return-encapsulate-errno-value arch/x86/kernel/cpu/mcheck/therm_throt.c --- a/arch/x86/kernel/cpu/mcheck/therm_throt.c~x86-convert-cpu-notifier-to-return-encapsulate-errno-value +++ a/arch/x86/kernel/cpu/mcheck/therm_throt.c @@ -190,7 +190,7 @@ thermal_throttle_cpu_callback(struct not mutex_unlock(&therm_cpu_lock); break; } - return err ? NOTIFY_BAD : NOTIFY_OK; + return notifier_from_errno(err); } static struct notifier_block thermal_throttle_cpu_notifier __cpuinitdata = diff -puN arch/x86/kernel/cpuid.c~x86-convert-cpu-notifier-to-return-encapsulate-errno-value arch/x86/kernel/cpuid.c --- a/arch/x86/kernel/cpuid.c~x86-convert-cpu-notifier-to-return-encapsulate-errno-value +++ a/arch/x86/kernel/cpuid.c @@ -169,7 +169,7 @@ static int __cpuinit cpuid_class_cpu_cal cpuid_device_destroy(cpu); break; } - return err ? NOTIFY_BAD : NOTIFY_OK; + return notifier_from_errno(err); } static struct notifier_block __refdata cpuid_class_cpu_notifier = diff -puN arch/x86/kernel/msr.c~x86-convert-cpu-notifier-to-return-encapsulate-errno-value arch/x86/kernel/msr.c --- a/arch/x86/kernel/msr.c~x86-convert-cpu-notifier-to-return-encapsulate-errno-value +++ a/arch/x86/kernel/msr.c @@ -229,7 +229,7 @@ static int __cpuinit msr_class_cpu_callb msr_device_destroy(cpu); break; } - return err ? NOTIFY_BAD : NOTIFY_OK; + return notifier_from_errno(err); } static struct notifier_block __refdata msr_class_cpu_notifier = { _ Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are intel-iommu-use-for_each_set_bit.patch bitops-rename-for_each_bit-to-for_each_set_bit-mtd.patch cpu-hotplug-introduce-cpu_notify-__cpu_notify-cpu_notify_nofail.patch cpu-hotplug-return-better-errno-on-cpu-hotplug-failure.patch notifier-change-notifier_from_errno0-to-return-notify_ok.patch x86-convert-cpu-notifier-to-return-encapsulate-errno-value.patch topology-convert-cpu-notifier-to-return-encapsulate-errno-value.patch kernel-convert-cpu-notifier-to-return-encapsulate-errno-value.patch slab-convert-cpu-notifier-to-return-encapsulate-errno-value.patch iucv-convert-cpu-notifier-to-return-encapsulate-errno-value.patch ehca-convert-cpu-notifier-to-return-encapsulate-errno-value.patch s390-convert-cpu-notifier-to-return-encapsulate-errno-value.patch md-convert-cpu-notifier-to-return-encapsulate-errno-value.patch fault-injection-add-cpu-notifier-error-injection-module.patch bitops-remove-temporary-for_each_bit.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