From 641ae11893bbf37ba9bb1219b8dcf63ba58767ee Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 30 Nov 2010 11:12:30 +0000
Subject: [PATCH] --- yaml --- r: 225885 b: refs/heads/master c:
 bbc81fd4327f9ed4480b05981e38acd48b1d184a h: refs/heads/master i:   225883:
 09ceec7932a57e8042bc712e45610336c8425059 v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/arm/mach-omap2/omap-hotplug.c |  8 --------
 trunk/arch/arm/mach-realview/hotplug.c   | 10 ----------
 trunk/arch/arm/mach-s5pv310/hotplug.c    | 10 ----------
 trunk/arch/arm/mach-tegra/hotplug.c      | 10 ----------
 trunk/arch/arm/mach-ux500/hotplug.c      | 10 ----------
 6 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/[refs] b/[refs]
index d99c8d87cb9e..c0c3b26416c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c030beabf937b1d3b4ecaedfd1fb2f1e2aa0c70
+refs/heads/master: bbc81fd4327f9ed4480b05981e38acd48b1d184a
diff --git a/trunk/arch/arm/mach-omap2/omap-hotplug.c b/trunk/arch/arm/mach-omap2/omap-hotplug.c
index ace979d74bfc..4976b9393e49 100644
--- a/trunk/arch/arm/mach-omap2/omap-hotplug.c
+++ b/trunk/arch/arm/mach-omap2/omap-hotplug.c
@@ -32,14 +32,6 @@ int platform_cpu_kill(unsigned int cpu)
  */
 void platform_cpu_die(unsigned int cpu)
 {
-	unsigned int this_cpu = hard_smp_processor_id();
-
-	if (cpu != this_cpu) {
-		pr_crit("platform_cpu_die running on %u, should be %u\n",
-			   this_cpu, cpu);
-		BUG();
-	}
-
 	flush_cache_all();
 	dsb();
 
diff --git a/trunk/arch/arm/mach-realview/hotplug.c b/trunk/arch/arm/mach-realview/hotplug.c
index 7d58c16c83a7..e06572e6c490 100644
--- a/trunk/arch/arm/mach-realview/hotplug.c
+++ b/trunk/arch/arm/mach-realview/hotplug.c
@@ -102,16 +102,6 @@ int platform_cpu_kill(unsigned int cpu)
  */
 void platform_cpu_die(unsigned int cpu)
 {
-#ifdef DEBUG
-	unsigned int this_cpu = hard_smp_processor_id();
-
-	if (cpu != this_cpu) {
-		printk(KERN_CRIT "Eek! platform_cpu_die running on %u, should be %u\n",
-			   this_cpu, cpu);
-		BUG();
-	}
-#endif
-
 	/*
 	 * we're ready for shutdown now, so do it
 	 */
diff --git a/trunk/arch/arm/mach-s5pv310/hotplug.c b/trunk/arch/arm/mach-s5pv310/hotplug.c
index d7be70ac7536..ea951ef6ea54 100644
--- a/trunk/arch/arm/mach-s5pv310/hotplug.c
+++ b/trunk/arch/arm/mach-s5pv310/hotplug.c
@@ -105,16 +105,6 @@ int platform_cpu_kill(unsigned int cpu)
  */
 void platform_cpu_die(unsigned int cpu)
 {
-#ifdef DEBUG
-	unsigned int this_cpu = hard_smp_processor_id();
-
-	if (cpu != this_cpu) {
-		printk(KERN_CRIT "Eek! platform_cpu_die running on %u, should be %u\n",
-			   this_cpu, cpu);
-		BUG();
-	}
-#endif
-
 	/*
 	 * we're ready for shutdown now, so do it
 	 */
diff --git a/trunk/arch/arm/mach-tegra/hotplug.c b/trunk/arch/arm/mach-tegra/hotplug.c
index ecaa41ce4976..a5eeb9126645 100644
--- a/trunk/arch/arm/mach-tegra/hotplug.c
+++ b/trunk/arch/arm/mach-tegra/hotplug.c
@@ -101,16 +101,6 @@ int platform_cpu_kill(unsigned int cpu)
  */
 void platform_cpu_die(unsigned int cpu)
 {
-#ifdef DEBUG
-	unsigned int this_cpu = hard_smp_processor_id();
-
-	if (cpu != this_cpu) {
-		printk(KERN_CRIT "Eek! platform_cpu_die running on %u, should be %u\n",
-			   this_cpu, cpu);
-		BUG();
-	}
-#endif
-
 	/*
 	 * we're ready for shutdown now, so do it
 	 */
diff --git a/trunk/arch/arm/mach-ux500/hotplug.c b/trunk/arch/arm/mach-ux500/hotplug.c
index 7a4890b96e5c..dd8037ebccf8 100644
--- a/trunk/arch/arm/mach-ux500/hotplug.c
+++ b/trunk/arch/arm/mach-ux500/hotplug.c
@@ -45,16 +45,6 @@ int platform_cpu_kill(unsigned int cpu)
  */
 void platform_cpu_die(unsigned int cpu)
 {
-#ifdef DEBUG
-	unsigned int this_cpu = hard_smp_processor_id();
-
-	if (cpu != this_cpu) {
-		printk(KERN_CRIT "Eek! platform_cpu_die running on %u, should be %u\n",
-			   this_cpu, cpu);
-		BUG();
-	}
-#endif
-
 	/* directly enter low power state, skipping secure registers */
 	platform_do_lowpower(cpu);
 }