linux-kernel - [PATCH] MPC85xx -> FSL_SOC

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Wed, 26 May 2010 12:19:59 +0200
From:	Christoph Egger <siccegge@...fau.de>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	Doug Thompson <dougthompson@...ssion.com>,
	Peter Tyser <ptyser@...-inc.com>,
	Dave Jiang <djiang@...sta.com>,
	Yang Shi <yang.shi@...driver.com>, linux-kernel@...r.kernel.org
Cc:	vamos@...informatik.uni-erlangen.de
Subject: [PATCH] MPC85xx -> FSL_SOC_BOOKE

Hi all!

	As part of the VAMOS[0] research project at the University of
Erlangen we are looking at multiple integrity errors in linux'
configuration system.

	There was a restructuring of Kconfig in October leafing some
dangling ifdefs behind that aren't referenced any more. I've created a
patch following the pattern used in the restructuring.

	Please keep me informed of this patch getting confirmed /
merged so we can keep track of it.

Regards

	Christoph Egger

[0] http://vamos1.informatik.uni-erlangen.de/

----
>From ac003845a68e37e2fbb1ac5849fb46b8b3100a07 Mon Sep 17 00:00:00 2001
From: Christoph Egger <siccegge@...fau.de>
Date: Wed, 26 May 2010 12:13:36 +0200
Subject: Missing pieces from MPC85xx -> FSL_SOC_BOOKE

In 5753c082f66eca5be81f6bda85c1718c5eea6ada 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@...fau.de>
---
 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 6c1886b..25e7ea0 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -43,7 +43,7 @@ static u32 orig_pci_err_en;
 #endif
 
 static u32 orig_l2_err_disable;
-#ifdef CONFIG_MPC85xx
+#ifdef CONFIG_FSL_SOC_BOOKE
 static u32 orig_hid1[2];
 #endif
 
@@ -1136,7 +1136,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)
 {
 	orig_hid1[smp_processor_id()] = mfspr(SPRN_HID1);
@@ -1175,7 +1175,7 @@ static int __init mpc85xx_mc_init(void)
 		printk(KERN_WARNING EDAC_MOD_STR "PCI fails to register\n");
 #endif
 
-#ifdef CONFIG_MPC85xx
+#ifdef CONFIG_FSL_SOC_BOOKE
 	/*
 	 * need to clear HID1[RFXE] to disable machine check int
 	 * so we can catch it
@@ -1189,7 +1189,7 @@ static int __init mpc85xx_mc_init(void)
 
 module_init(mpc85xx_mc_init);
 
-#ifdef CONFIG_MPC85xx
+#ifdef CONFIG_FSL_SOC_BOOKE
 static void __exit mpc85xx_mc_restore_hid1(void *data)
 {
 	mtspr(SPRN_HID1, orig_hid1[smp_processor_id()]);
@@ -1198,7 +1198,7 @@ static void __exit mpc85xx_mc_restore_hid1(void *data)
 
 static void __exit mpc85xx_mc_exit(void)
 {
-#ifdef CONFIG_MPC85xx
+#ifdef CONFIG_FSL_SOC_BOOKE
 	on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0);
 #endif
 #ifdef CONFIG_PCI
-- 
1.6.3.3













--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/