x86/cleanups changes for v2.6.40

GIT PULL Ingo Molnar 1 participant 1 message May 19, 2011 x86

lore

Share & tools

lore

Ingo Molnar

author

2011-05-19 20:47 UTC #0 lore raw

Linus,

Please pull the latest x86-cleanups-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-cleanups-for-linus

Thanks,

Ingo

------------------>
Bart Van Assche (1):
x86: Fix spelling error in the memcpy() source code comment

Luis R. Rodriguez (1):
x86: Fix mrst sparse complaints

Rakib Mullick (1):
x86, mpparse: Remove unnecessary variable

 arch/x86/kernel/mpparse.c     |    4 +---
 arch/x86/lib/memcpy_64.S      |    2 +-
 arch/x86/platform/mrst/mrst.c |    4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

arch/x86/kernel/mpparse.c +1 -3

index 5a532ce..ef59817 100644
@@ -718,14 +718,12 @@ static void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare)
 static int
 check_slot(unsigned long mpc_new_phys, unsigned long mpc_new_length, int count)
 {
-	int ret = 0;
-
 	if (!mpc_new_phys || count <= mpc_new_length) {
 		WARN(1, "update_mptable: No spare slots (length: %x)\n", count);
 		return -1;
 	}
 
-	return ret;
+	return 0;
 }
 #else /* CONFIG_X86_IO_APIC */
 static

arch/x86/lib/memcpy_64.S +1 -1

index 75ef61e..2a560bb 100644
@@ -49,7 +49,7 @@ ENTRY(memcpy)
 	jb .Lhandle_tail
 
 	/*
-	 * We check whether memory false dependece could occur,
+	 * We check whether memory false dependence could occur,
 	 * then jump to corresponding copy mode.
 	 */
 	cmp  %dil, %sil

arch/x86/platform/mrst/mrst.c +2 -2

index 275dbc1..7000e74 100644
@@ -194,7 +194,7 @@ static unsigned long __init mrst_calibrate_tsc(void)
 	return 0;
 }
 
-void __init mrst_time_init(void)
+static void __init mrst_time_init(void)
 {
 	sfi_table_parse(SFI_SIG_MTMR, NULL, NULL, sfi_parse_mtmr);
 	switch (mrst_timer_options) {

@@ -216,7 +216,7 @@ void __init mrst_time_init(void)
 	apbt_time_init();
 }
 
-void __cpuinit mrst_arch_setup(void)
+static void __cpuinit mrst_arch_setup(void)
 {
 	if (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 0x27)
 		__mrst_cpu_chip = MRST_CPU_CHIP_PENWELL;