From 3b341dbd3b08238f48a5907f823e0fc31dc3bb0f Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Thu, 26 Jul 2012 11:02:16 +0000
Subject: [PATCH] --- yaml --- r: 318945 b: refs/heads/master c:
 881e02d298451e1788669662e72ccfd69859dae5 h: refs/heads/master i:   318943:
 99ec5ce8cbca0ac03ba98bda588c4ccac78e1ca6 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/sparc/include/asm/pgtable_32.h | 5 +++--
 trunk/arch/sparc/kernel/head_32.S         | 2 --
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ada8895d0100..00de4654d08d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cdfbc74c8820cd33367fb3d61edcbe9829a06c5
+refs/heads/master: 881e02d298451e1788669662e72ccfd69859dae5
diff --git a/trunk/arch/sparc/include/asm/pgtable_32.h b/trunk/arch/sparc/include/asm/pgtable_32.h
index cbbbed5cb3aa..c704f949b7ef 100644
--- a/trunk/arch/sparc/include/asm/pgtable_32.h
+++ b/trunk/arch/sparc/include/asm/pgtable_32.h
@@ -52,8 +52,9 @@ extern unsigned long calc_highpages(void);
 #define PAGE_READONLY	SRMMU_PAGE_RDONLY
 #define PAGE_KERNEL	SRMMU_PAGE_KERNEL
 
-/* Top-level page directory */
-extern pgd_t swapper_pg_dir[1024];
+/* Top-level page directory - dummy used by init-mm.
+ * srmmu.c will assign the real one (which is dynamically sized) */
+#define swapper_pg_dir NULL
 
 extern void paging_init(void);
 
diff --git a/trunk/arch/sparc/kernel/head_32.S b/trunk/arch/sparc/kernel/head_32.S
index afeb1d770303..3d92c0a8f6c4 100644
--- a/trunk/arch/sparc/kernel/head_32.S
+++ b/trunk/arch/sparc/kernel/head_32.S
@@ -58,8 +58,6 @@ sun4e_notsup:
 /* This was the only reasonable way I could think of to properly align
  * these page-table data structures.
  */
-	.globl swapper_pg_dir
-swapper_pg_dir:		.skip PAGE_SIZE
 	.globl empty_zero_page
 empty_zero_page:	.skip PAGE_SIZE