From fb20c335eb9017c5535c3c92c3d8973a45b9ad48 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Mon, 14 May 2007 17:11:58 -0500
Subject: [PATCH] --- yaml --- r: 56591 b: refs/heads/master c:
 991eb43af989002d5c7f4a2ff2a6c806a912b51b h: refs/heads/master i:   56589:
 b87a54b672f5c2299c50cd975196bf2b5dce4087   56587:
 6b13a0d412fbcc04b36e1875486384f52e432ef1   56583:
 8420c0a446676f968a1bd4f0e811669cf3959514   56575:
 195f9a7005f9395322cb18321c7e7cba40139742 v: v3

---
 [refs]                               |  2 +-
 trunk/arch/powerpc/kernel/entry_32.S | 18 +++++++++++++++---
 trunk/arch/powerpc/mm/hash_low_32.S  | 18 ++++++++++++++----
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index b0e002a26da2..e43d284186eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40ebbcbf23d5592f58712fca2ab406ff818e2d65
+refs/heads/master: 991eb43af989002d5c7f4a2ff2a6c806a912b51b
diff --git a/trunk/arch/powerpc/kernel/entry_32.S b/trunk/arch/powerpc/kernel/entry_32.S
index c29d1652a421..4074c0b31453 100644
--- a/trunk/arch/powerpc/kernel/entry_32.S
+++ b/trunk/arch/powerpc/kernel/entry_32.S
@@ -596,7 +596,11 @@ fast_exception_return:
 	mr	r12,r4		/* restart at exc_exit_restart */
 	b	2b
 
-	.comm	fee_restarts,4
+	.section .bss
+	.align	2
+fee_restarts:
+	.space	4
+	.previous
 
 /* aargh, a nonrecoverable interrupt, panic */
 /* aargh, we don't know which trap this is */
@@ -851,7 +855,11 @@ load_dbcr0:
 	mtspr	SPRN_DBSR,r11	/* clear all pending debug events */
 	blr
 
-	.comm	global_dbcr0,8
+	.section .bss
+	.align	4
+global_dbcr0:
+	.space	8
+	.previous
 #endif /* !(CONFIG_4xx || CONFIG_BOOKE) */
 
 do_work:			/* r10 contains MSR_KERNEL here */
@@ -926,7 +934,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_601)
 	/* shouldn't return */
 	b	4b
 
-	.comm	ee_restarts,4
+	.section .bss
+	.align	2
+ee_restarts:
+	.space	4
+	.previous
 
 /*
  * PROM code for specific machines follows.  Put it
diff --git a/trunk/arch/powerpc/mm/hash_low_32.S b/trunk/arch/powerpc/mm/hash_low_32.S
index ddceefc06ecc..7f830a4888d6 100644
--- a/trunk/arch/powerpc/mm/hash_low_32.S
+++ b/trunk/arch/powerpc/mm/hash_low_32.S
@@ -30,7 +30,11 @@
 #include <asm/asm-offsets.h>
 
 #ifdef CONFIG_SMP
-	.comm	mmu_hash_lock,4
+	.section .bss
+	.align	2
+	.globl mmu_hash_lock
+mmu_hash_lock:
+	.space	4
 #endif /* CONFIG_SMP */
 
 /*
@@ -455,9 +459,15 @@ found_slot:
 	sync		/* make sure pte updates get to memory */
 	blr
 
-	.comm	next_slot,4
-	.comm	primary_pteg_full,4
-	.comm	htab_hash_searches,4
+	.section .bss
+	.align	2
+next_slot:
+	.space	4
+primary_pteg_full:
+	.space	4
+htab_hash_searches:
+	.space	4
+	.previous
 
 /*
  * Flush the entry for a particular page from the hash table.