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

Commit bd1688dc authored by Christoph Egger's avatar Christoph Egger Committed by Linus Torvalds
Browse files

edac: add wissing pieces from MPC85xx -> FSL_SOC_BOOKE 



In 5753c082 ("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: default avatarChristoph 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c52b0b91

drivers/edac/mpc85xx_edac.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ static u32 orig_pci_err_en; 
#endif

#endif





static u32 orig_l2_err_disable;

static u32 orig_l2_err_disable;

#ifdef CONFIG_MPC85xx

#ifdef CONFIG_FSL_SOC_BOOKE

static u32 orig_hid1[2];

static u32 orig_hid1[2];

#endif

#endif
@@ -1140,7 +1140,7 @@ static struct of_platform_driver mpc85xx_mc_err_driver = { 
	},

	},

};

};





#ifdef CONFIG_MPC85xx

#ifdef CONFIG_FSL_SOC_BOOKE

static void __init mpc85xx_mc_clear_rfxe(void *data)

static void __init mpc85xx_mc_clear_rfxe(void *data)

{

{

	orig_hid1[smp_processor_id()] = mfspr(SPRN_HID1);

	orig_hid1[smp_processor_id()] = mfspr(SPRN_HID1);
@@ -1179,7 +1179,7 @@ static int __init mpc85xx_mc_init(void) 
		printk(KERN_WARNING EDAC_MOD_STR "PCI fails to register\n");

		printk(KERN_WARNING EDAC_MOD_STR "PCI fails to register\n");

#endif

#endif





#ifdef CONFIG_MPC85xx

#ifdef CONFIG_FSL_SOC_BOOKE

	/*

	/*

	 * need to clear HID1[RFXE] to disable machine check int

	 * need to clear HID1[RFXE] to disable machine check int

	 * so we can catch it

	 * so we can catch it
@@ -1193,7 +1193,7 @@ static int __init mpc85xx_mc_init(void) 




module_init(mpc85xx_mc_init);

module_init(mpc85xx_mc_init);





#ifdef CONFIG_MPC85xx

#ifdef CONFIG_FSL_SOC_BOOKE

static void __exit mpc85xx_mc_restore_hid1(void *data)

static void __exit mpc85xx_mc_restore_hid1(void *data)

{

{

	mtspr(SPRN_HID1, orig_hid1[smp_processor_id()]);

	mtspr(SPRN_HID1, orig_hid1[smp_processor_id()]);
@@ -1202,7 +1202,7 @@ static void __exit mpc85xx_mc_restore_hid1(void *data) 




static void __exit mpc85xx_mc_exit(void)

static void __exit mpc85xx_mc_exit(void)

{

{

#ifdef CONFIG_MPC85xx

#ifdef CONFIG_FSL_SOC_BOOKE

	on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0);

	on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0);

#endif

#endif

#ifdef CONFIG_PCI

#ifdef CONFIG_PCI