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

Commit 460c1338 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, mce: remove incorrect __cpuinit for mce_cpu_features()
  MAINTAINERS: paravirt-ops maintainers update
parents 710320d5 cc3ca220

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -3334,8 +3334,8 @@ P: Jeremy Fitzhardinge 
M:	jeremy@xensource.com

P:	Chris Wright

M:	chrisw@sous-sol.org

P:	Zachary Amsden

M:	zach@vmware.com

P:	Alok Kataria

M:	akataria@vmware.com

P:	Rusty Russell

M:	rusty@rustcorp.com.au

L:	virtualization@lists.osdl.org

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

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static void __cpuinit mce_cpu_quirks(struct cpuinfo_x86 *c) 


}



static void __cpuinit mce_cpu_features(struct cpuinfo_x86 *c)

static void mce_cpu_features(struct cpuinfo_x86 *c)

{

	switch (c->x86_vendor) {

	case X86_VENDOR_INTEL:

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

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static long threshold_restart_bank(void *_tr) 
}



/* cpu init entry point, called from mce.c with preempt off */

void __cpuinit mce_amd_feature_init(struct cpuinfo_x86 *c)

void mce_amd_feature_init(struct cpuinfo_x86 *c)

{

	unsigned int bank, block;

	unsigned int cpu = smp_processor_id();

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

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ asmlinkage void smp_thermal_interrupt(void) 
	irq_exit();

}



static void __cpuinit intel_init_thermal(struct cpuinfo_x86 *c)

static void intel_init_thermal(struct cpuinfo_x86 *c)

{

	u32 l, h;

	int tm2 = 0;
@@ -84,7 +84,7 @@ static void __cpuinit intel_init_thermal(struct cpuinfo_x86 *c) 
	return;

}



void __cpuinit mce_intel_feature_init(struct cpuinfo_x86 *c)

void mce_intel_feature_init(struct cpuinfo_x86 *c)

{

	intel_init_thermal(c);

}