From 5efd5779d982a62b703fb89d16f10731522bb7a3 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 17 Feb 2009 15:09:08 +0100
Subject: [PATCH] --- yaml --- r: 136879 b: refs/heads/master c:
 b9e0d1aa9767707cad24db32d8ce0409df16d491 h: refs/heads/master i:   136877:
 103585dc9031b4a6a3c3b6e2e97fdd90b900c75f   136875:
 f97845e9aa6b591deb14ae3d1d652cf3a3b2145d   136871:
 c54ee2418e3e8123ffca2c62cc76231f47234c85   136863:
 f05021c098af166c55ce5c6278df072337c84eb9 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/kernel/es7000_32.c | 8 ++------
 trunk/arch/x86/kernel/numaq_32.c  | 2 --
 trunk/arch/x86/kernel/summit_32.c | 9 +++------
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index a0df1537ee34..8a42965b4d1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c4ce18c95d632c9227ebcc6d45da11a9ef1ec70
+refs/heads/master: b9e0d1aa9767707cad24db32d8ce0409df16d491
diff --git a/trunk/arch/x86/kernel/es7000_32.c b/trunk/arch/x86/kernel/es7000_32.c
index c7cc9776ccae..8a20866b2a39 100644
--- a/trunk/arch/x86/kernel/es7000_32.c
+++ b/trunk/arch/x86/kernel/es7000_32.c
@@ -146,8 +146,6 @@ extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);
 extern void unmap_unisys_acpi_oem_table(unsigned long oem_addr);
 extern void setup_unisys(void);
 
-#define apicid_cluster(apicid)		(apicid & 0xF0)
-
 /*
  * ES7000 Globals
  */
@@ -595,8 +593,7 @@ es7000_cpu_mask_to_apicid_cluster(const struct cpumask *cpumask)
 		if (cpumask_test_cpu(cpu, cpumask)) {
 			int new_apicid = es7000_cpu_to_logical_apicid(cpu);
 
-			if (apicid_cluster(apicid) !=
-					apicid_cluster(new_apicid)) {
+			if (APIC_CLUSTER(apicid) != APIC_CLUSTER(new_apicid)) {
 				printk ("%s: Not a valid mask!\n", __func__);
 
 				return 0xFF;
@@ -630,8 +627,7 @@ static unsigned int es7000_cpu_mask_to_apicid(const cpumask_t *cpumask)
 		if (cpu_isset(cpu, *cpumask)) {
 			int new_apicid = es7000_cpu_to_logical_apicid(cpu);
 
-			if (apicid_cluster(apicid) !=
-					apicid_cluster(new_apicid)) {
+			if (APIC_CLUSTER(apicid) != APIC_CLUSTER(new_apicid)) {
 				printk ("%s: Not a valid mask!\n", __func__);
 
 				return es7000_cpu_to_logical_apicid(0);
diff --git a/trunk/arch/x86/kernel/numaq_32.c b/trunk/arch/x86/kernel/numaq_32.c
index 9abaacde72eb..15328500de6e 100644
--- a/trunk/arch/x86/kernel/numaq_32.c
+++ b/trunk/arch/x86/kernel/numaq_32.c
@@ -375,8 +375,6 @@ static inline unsigned long numaq_check_apicid_present(int bit)
 	return physid_isset(bit, phys_cpu_present_map);
 }
 
-#define apicid_cluster(apicid) (apicid & 0xF0)
-
 static inline int numaq_apic_id_registered(void)
 {
 	return 1;
diff --git a/trunk/arch/x86/kernel/summit_32.c b/trunk/arch/x86/kernel/summit_32.c
index 7a1db1f23563..c4690349a54a 100644
--- a/trunk/arch/x86/kernel/summit_32.c
+++ b/trunk/arch/x86/kernel/summit_32.c
@@ -207,14 +207,12 @@ static inline unsigned long summit_check_apicid_present(int bit)
 	return 1;
 }
 
-#define apicid_cluster(apicid) ((apicid) & XAPIC_DEST_CLUSTER_MASK)
-
 static inline void summit_init_apic_ldr(void)
 {
 	unsigned long val, id;
 	int count = 0;
 	u8 my_id = (u8)hard_smp_processor_id();
-	u8 my_cluster = (u8)apicid_cluster(my_id);
+	u8 my_cluster = APIC_CLUSTER(my_id);
 #ifdef CONFIG_SMP
 	u8 lid;
 	int i;
@@ -222,7 +220,7 @@ static inline void summit_init_apic_ldr(void)
 	/* Create logical APIC IDs by counting CPUs already in cluster. */
 	for (count = 0, i = nr_cpu_ids; --i >= 0; ) {
 		lid = cpu_2_logical_apicid[i];
-		if (lid != BAD_APICID && apicid_cluster(lid) == my_cluster)
+		if (lid != BAD_APICID && APIC_CLUSTER(lid) == my_cluster)
 			++count;
 	}
 #endif
@@ -319,8 +317,7 @@ static inline unsigned int summit_cpu_mask_to_apicid(const cpumask_t *cpumask)
 		if (cpu_isset(cpu, *cpumask)) {
 			int new_apicid = summit_cpu_to_logical_apicid(cpu);
 
-			if (apicid_cluster(apicid) !=
-					apicid_cluster(new_apicid)) {
+			if (APIC_CLUSTER(apicid) != APIC_CLUSTER(new_apicid)) {
 				printk ("%s: Not a valid mask!\n", __func__);
 
 				return 0xFF;