Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bd1688dcdf6e986913f3f1ff2df9dc2bfb63db5c

Authored by Christoph Egger
Committed by Linus Torvalds
1 parent c52b0b91ba
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

edac: add wissing pieces from MPC85xx -> FSL_SOC_BOOKE 

In 5753c082f66eca5be81f6bda85c1718c5eea6ada ("powerpc/85xx: Kconfig
cleanup") menuconfig MPC85xx was replaced by FSL_SOC_BOOKE but some
references insider the code were not adjusted accordingly.  This patch
adresses these missing pieces.

Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Cc: Doug Thompson <dougthompson@xmission.com>
Cc: Peter Tyser <ptyser@xes-inc.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 5 additions and 5 deletions Side-by-side Diff

drivers/edac/mpc85xx_edac.c
Diff comments   View file @ bd1688d
... ... @@ -43,7 +43,7 @@
43 43 #endif
44 44  
45 45 static u32 orig_l2_err_disable;
46   -#ifdef CONFIG_MPC85xx
  46 +#ifdef CONFIG_FSL_SOC_BOOKE
47 47 static u32 orig_hid1[2];
48 48 #endif
49 49  
... ... @@ -1140,7 +1140,7 @@
1140 1140 },
1141 1141 };
1142 1142  
1143   -#ifdef CONFIG_MPC85xx
  1143 +#ifdef CONFIG_FSL_SOC_BOOKE
1144 1144 static void __init mpc85xx_mc_clear_rfxe(void *data)
1145 1145 {
1146 1146 orig_hid1[smp_processor_id()] = mfspr(SPRN_HID1);
... ... @@ -1179,7 +1179,7 @@
1179 1179 printk(KERN_WARNING EDAC_MOD_STR "PCI fails to register\n");
1180 1180 #endif
1181 1181  
1182   -#ifdef CONFIG_MPC85xx
  1182 +#ifdef CONFIG_FSL_SOC_BOOKE
1183 1183 /*
1184 1184 * need to clear HID1[RFXE] to disable machine check int
1185 1185 * so we can catch it
... ... @@ -1193,7 +1193,7 @@
1193 1193  
1194 1194 module_init(mpc85xx_mc_init);
1195 1195  
1196   -#ifdef CONFIG_MPC85xx
  1196 +#ifdef CONFIG_FSL_SOC_BOOKE
1197 1197 static void __exit mpc85xx_mc_restore_hid1(void *data)
1198 1198 {
1199 1199 mtspr(SPRN_HID1, orig_hid1[smp_processor_id()]);
... ... @@ -1202,7 +1202,7 @@
1202 1202  
1203 1203 static void __exit mpc85xx_mc_exit(void)
1204 1204 {
1205   -#ifdef CONFIG_MPC85xx
  1205 +#ifdef CONFIG_FSL_SOC_BOOKE
1206 1206 on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0);
1207 1207 #endif
1208 1208 #ifdef CONFIG_PCI