From 1736b11f2224e30c0345353f1619e287e5328f68 Mon Sep 17 00:00:00 2001
From: Thiemo Seufer <ths@networkno.de>
Date: Thu, 23 Dec 2004 08:21:39 +0000
Subject: [PATCH] --- yaml --- r: 10959 b: refs/heads/master c:
 0964ce24d091a1d3dc7f667e1b107ab77d4325e6 h: refs/heads/master i:   10957:
 75d9bc16f9c4eb48e90a7959bbfab6af247fb63a   10955:
 61b0b22e09a64a2a54824f2f51fd75ceb4486d44   10951:
 20c114d6ea5d279e124d37176393537c03e8427b   10943:
 31ef4742488a194a83c40ccfab28567ee5071d01 v: v3

---
 [refs]                        |  2 +-
 trunk/arch/mips/kernel/head.S | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 73888f41415a..093e95985aa8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c264852726dde251a0c09ec22f61a9be8b0db68b
+refs/heads/master: 0964ce24d091a1d3dc7f667e1b107ab77d4325e6
diff --git a/trunk/arch/mips/kernel/head.S b/trunk/arch/mips/kernel/head.S
index 2a1b45d66f04..124c27e908f4 100644
--- a/trunk/arch/mips/kernel/head.S
+++ b/trunk/arch/mips/kernel/head.S
@@ -200,19 +200,13 @@ NESTED(smp_bootstrap, 16, sp)
 	.comm	fw_arg2, SZREG, SZREG
 	.comm	fw_arg3, SZREG, SZREG
 
-	.macro	page name, order=0
-	.globl	\name
-\name:	.size	\name, (_PAGE_SIZE << \order)
-	.org	. + (_PAGE_SIZE << \order)
-	.type	\name, @object
+	.macro page name, order
+	.comm	\name, (_PAGE_SIZE << \order), (_PAGE_SIZE << \order)
 	.endm
 
-	.data
-	.align	PAGE_SHIFT
-
 	/*
-	 * ... but on 64-bit we've got three-level pagetables with a
-	 * slightly different layout ...
+	 * On 64-bit we've got three-level pagetables with a slightly
+	 * different layout ...
 	 */
 	page	swapper_pg_dir, _PGD_ORDER
 #ifdef CONFIG_64BIT