diff options
| -rw-r--r-- | drivers/edac/mpc85xx_edac.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index 1052340e6802..fdbad5527098 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c | |||
| @@ -43,7 +43,7 @@ static u32 orig_pci_err_en; | |||
| 43 | #endif | 43 | #endif |
| 44 | 44 | ||
| 45 | static u32 orig_l2_err_disable; | 45 | static u32 orig_l2_err_disable; |
| 46 | #ifdef CONFIG_MPC85xx | 46 | #ifdef CONFIG_FSL_SOC_BOOKE |
| 47 | static u32 orig_hid1[2]; | 47 | static u32 orig_hid1[2]; |
| 48 | #endif | 48 | #endif |
| 49 | 49 | ||
| @@ -1140,7 +1140,7 @@ static struct of_platform_driver mpc85xx_mc_err_driver = { | |||
| 1140 | }, | 1140 | }, |
| 1141 | }; | 1141 | }; |
| 1142 | 1142 | ||
| 1143 | #ifdef CONFIG_MPC85xx | 1143 | #ifdef CONFIG_FSL_SOC_BOOKE |
| 1144 | static void __init mpc85xx_mc_clear_rfxe(void *data) | 1144 | static void __init mpc85xx_mc_clear_rfxe(void *data) |
| 1145 | { | 1145 | { |
| 1146 | orig_hid1[smp_processor_id()] = mfspr(SPRN_HID1); | 1146 | orig_hid1[smp_processor_id()] = mfspr(SPRN_HID1); |
| @@ -1179,7 +1179,7 @@ static int __init mpc85xx_mc_init(void) | |||
| 1179 | printk(KERN_WARNING EDAC_MOD_STR "PCI fails to register\n"); | 1179 | printk(KERN_WARNING EDAC_MOD_STR "PCI fails to register\n"); |
| 1180 | #endif | 1180 | #endif |
| 1181 | 1181 | ||
| 1182 | #ifdef CONFIG_MPC85xx | 1182 | #ifdef CONFIG_FSL_SOC_BOOKE |
| 1183 | /* | 1183 | /* |
| 1184 | * need to clear HID1[RFXE] to disable machine check int | 1184 | * need to clear HID1[RFXE] to disable machine check int |
| 1185 | * so we can catch it | 1185 | * so we can catch it |
| @@ -1193,7 +1193,7 @@ static int __init mpc85xx_mc_init(void) | |||
| 1193 | 1193 | ||
| 1194 | module_init(mpc85xx_mc_init); | 1194 | module_init(mpc85xx_mc_init); |
| 1195 | 1195 | ||
| 1196 | #ifdef CONFIG_MPC85xx | 1196 | #ifdef CONFIG_FSL_SOC_BOOKE |
| 1197 | static void __exit mpc85xx_mc_restore_hid1(void *data) | 1197 | static void __exit mpc85xx_mc_restore_hid1(void *data) |
| 1198 | { | 1198 | { |
| 1199 | mtspr(SPRN_HID1, orig_hid1[smp_processor_id()]); | 1199 | mtspr(SPRN_HID1, orig_hid1[smp_processor_id()]); |
| @@ -1202,7 +1202,7 @@ static void __exit mpc85xx_mc_restore_hid1(void *data) | |||
| 1202 | 1202 | ||
| 1203 | static void __exit mpc85xx_mc_exit(void) | 1203 | static void __exit mpc85xx_mc_exit(void) |
| 1204 | { | 1204 | { |
| 1205 | #ifdef CONFIG_MPC85xx | 1205 | #ifdef CONFIG_FSL_SOC_BOOKE |
| 1206 | on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0); | 1206 | on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0); |
| 1207 | #endif | 1207 | #endif |
| 1208 | #ifdef CONFIG_PCI | 1208 | #ifdef CONFIG_PCI |
