Patchwork [1/4] powerpc: remove unneeded cpu_setup/restore from POWER7 cputable entry

login
register
mail settings
Submitter Michael Neuling
Date Nov. 18, 2010, 4:52 a.m.
Message ID <20101118045247.454793259@neuling.org>
Download mbox | patch
Permalink /patch/72048/
State Accepted, archived
Commit 93fe56e99fb946fcd4244741bfc7af6638f1cac7
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Michael Neuling - Nov. 18, 2010, 4:52 a.m.
These are not needed so just remove them

Signed-off-by: Michael Neuling <mikey@neuling.org>

---
 arch/powerpc/kernel/cputable.c |    2 --
 arch/powerpc/kernel/misc.S     |    5 -----
 2 files changed, 7 deletions(-)

Patch

Index: linux-2.6-ozlabs/arch/powerpc/kernel/cputable.c
===================================================================
--- linux-2.6-ozlabs.orig/arch/powerpc/kernel/cputable.c
+++ linux-2.6-ozlabs/arch/powerpc/kernel/cputable.c
@@ -457,8 +457,6 @@ 
 		.dcache_bsize		= 128,
 		.num_pmcs		= 6,
 		.pmc_type		= PPC_PMC_IBM,
-		.cpu_setup		= __setup_cpu_power7,
-		.cpu_restore		= __restore_cpu_power7,
 		.oprofile_cpu_type	= "ppc64/power7",
 		.oprofile_type		= PPC_OPROFILE_POWER4,
 		.oprofile_mmcra_sihv	= POWER6_MMCRA_SIHV,
Index: linux-2.6-ozlabs/arch/powerpc/kernel/misc.S
===================================================================
--- linux-2.6-ozlabs.orig/arch/powerpc/kernel/misc.S
+++ linux-2.6-ozlabs/arch/powerpc/kernel/misc.S
@@ -122,8 +122,3 @@ 
 	mtlr	r0
 	mr	r3,r4
 	blr
-
-_GLOBAL(__setup_cpu_power7)
-_GLOBAL(__restore_cpu_power7)
-	/* place holder */
-	blr