Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a94247e7 authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

x86: convert cpu notifier to return encapsulate errno value 



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: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b957e043

arch/x86/kernel/cpu/mcheck/therm_throt.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ thermal_throttle_cpu_callback(struct notifier_block *nfb, 
		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 =

arch/x86/kernel/cpuid.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int __cpuinit cpuid_class_cpu_callback(struct notifier_block *nfb, 
		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 =

arch/x86/kernel/msr.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb, 
		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 = {