From 5f8c7eecbb71815c14808e16d6f33478cde8c4cd Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 13 Jun 2008 20:20:54 +0200
Subject: [PATCH] --- yaml --- r: 104163 b: refs/heads/master c:
 b1a8bf92a0303301f3e013e2a2f45a4916453ce7 h: refs/heads/master i:   104161:
 e47a1129b5e9dd28180923dc4428d12958e0d57a   104159:
 8bd07952651504060b2227c93333ea7280231021 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/sparc/kernel/entry.S    | 1 +
 trunk/include/asm-sparc/Kbuild     | 1 +
 trunk/include/asm-sparc/openprom.h | 2 --
 trunk/include/asm-sparc/pgtable.h  | 7 ++++++-
 trunk/include/asm-sparc/vaddrs.h   | 5 -----
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 5c77e19d042d..a59a6e128bf9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b444b9a5a1171ef07e1a87b01f7bb5bd0206d012
+refs/heads/master: b1a8bf92a0303301f3e013e2a2f45a4916453ce7
diff --git a/trunk/arch/sparc/kernel/entry.S b/trunk/arch/sparc/kernel/entry.S
index 55d3be1b5d81..2f96256dc515 100644
--- a/trunk/arch/sparc/kernel/entry.S
+++ b/trunk/arch/sparc/kernel/entry.S
@@ -19,6 +19,7 @@
 #include <asm/vaddrs.h>
 #include <asm/memreg.h>
 #include <asm/page.h>
+#include <asm/pgtable.h>
 #ifdef CONFIG_SUN4
 #include <asm/pgtsun4.h>
 #else
diff --git a/trunk/include/asm-sparc/Kbuild b/trunk/include/asm-sparc/Kbuild
index c8432483628e..c83e3c0aa30b 100644
--- a/trunk/include/asm-sparc/Kbuild
+++ b/trunk/include/asm-sparc/Kbuild
@@ -6,6 +6,7 @@ header-y += bpp.h
 header-y += display7seg.h
 header-y += envctrl.h
 header-y += jsflash.h
+header-y += openprom.h
 header-y += openpromio.h
 header-y += psrcompat.h
 header-y += pstate.h
diff --git a/trunk/include/asm-sparc/openprom.h b/trunk/include/asm-sparc/openprom.h
index ed4b6bc2b102..e812cf3b0de7 100644
--- a/trunk/include/asm-sparc/openprom.h
+++ b/trunk/include/asm-sparc/openprom.h
@@ -7,8 +7,6 @@
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
  */
 
-#include <asm/vaddrs.h>
-
 /* Empirical constants... */
 #define	LINUX_OPPROM_MAGIC      0x10010407
 
diff --git a/trunk/include/asm-sparc/pgtable.h b/trunk/include/asm-sparc/pgtable.h
index 60512296b2ca..b63ac6b4119f 100644
--- a/trunk/include/asm-sparc/pgtable.h
+++ b/trunk/include/asm-sparc/pgtable.h
@@ -8,6 +8,7 @@
  *  Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
  */
 
+#ifndef __ASSEMBLY__
 #include <asm-generic/4level-fixup.h>
 
 #include <linux/spinlock.h>
@@ -24,7 +25,6 @@
 #include <asm/btfixup.h>
 #include <asm/system.h>
 
-#ifndef __ASSEMBLY__
 
 struct vm_area_struct;
 struct page;
@@ -464,6 +464,11 @@ extern int io_remap_pfn_range(struct vm_area_struct *vma,
 
 #endif /* !(__ASSEMBLY__) */
 
+#define VMALLOC_START           0xfe600000
+/* XXX Alter this when I get around to fixing sun4c - Anton */
+#define VMALLOC_END             0xffc00000
+
+
 /* We provide our own get_unmapped_area to cope with VA holes for userland */
 #define HAVE_ARCH_UNMAPPED_AREA
 
diff --git a/trunk/include/asm-sparc/vaddrs.h b/trunk/include/asm-sparc/vaddrs.h
index f6ca4779056c..a22fed5a3c6b 100644
--- a/trunk/include/asm-sparc/vaddrs.h
+++ b/trunk/include/asm-sparc/vaddrs.h
@@ -34,11 +34,6 @@
 #define IOBASE_VADDR		0xfe000000
 #define IOBASE_END		0xfe600000
 
-#define VMALLOC_START		0xfe600000
-
-/* XXX Alter this when I get around to fixing sun4c - Anton */
-#define VMALLOC_END		0xffc00000
-
 /*
  * On the sun4/4c we need a place
  * to reliably map locked down kernel data.  This includes the