Commit b1a8bf92 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller

sparc: export openprom.h to userspace

sparc64 exports openprom.h to userspace so let sparc follow
the example.
As openprom.h pulled in another not-for-export vaddrs.h header
file it required a few changes to fix the build.

The definition af VMALLOC_* were moved to pgtable as this is
where sparc64 has them.
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent b444b9a5
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <asm/vaddrs.h> #include <asm/vaddrs.h>
#include <asm/memreg.h> #include <asm/memreg.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/pgtable.h>
#ifdef CONFIG_SUN4 #ifdef CONFIG_SUN4
#include <asm/pgtsun4.h> #include <asm/pgtsun4.h>
#else #else
......
...@@ -6,6 +6,7 @@ header-y += bpp.h ...@@ -6,6 +6,7 @@ header-y += bpp.h
header-y += display7seg.h header-y += display7seg.h
header-y += envctrl.h header-y += envctrl.h
header-y += jsflash.h header-y += jsflash.h
header-y += openprom.h
header-y += openpromio.h header-y += openpromio.h
header-y += psrcompat.h header-y += psrcompat.h
header-y += pstate.h header-y += pstate.h
......
...@@ -7,8 +7,6 @@ ...@@ -7,8 +7,6 @@
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
*/ */
#include <asm/vaddrs.h>
/* Empirical constants... */ /* Empirical constants... */
#define LINUX_OPPROM_MAGIC 0x10010407 #define LINUX_OPPROM_MAGIC 0x10010407
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
* Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
*/ */
#ifndef __ASSEMBLY__
#include <asm-generic/4level-fixup.h> #include <asm-generic/4level-fixup.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
...@@ -24,7 +25,6 @@ ...@@ -24,7 +25,6 @@
#include <asm/btfixup.h> #include <asm/btfixup.h>
#include <asm/system.h> #include <asm/system.h>
#ifndef __ASSEMBLY__
struct vm_area_struct; struct vm_area_struct;
struct page; struct page;
...@@ -464,6 +464,11 @@ extern int io_remap_pfn_range(struct vm_area_struct *vma, ...@@ -464,6 +464,11 @@ extern int io_remap_pfn_range(struct vm_area_struct *vma,
#endif /* !(__ASSEMBLY__) */ #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 */ /* We provide our own get_unmapped_area to cope with VA holes for userland */
#define HAVE_ARCH_UNMAPPED_AREA #define HAVE_ARCH_UNMAPPED_AREA
......
...@@ -34,11 +34,6 @@ ...@@ -34,11 +34,6 @@
#define IOBASE_VADDR 0xfe000000 #define IOBASE_VADDR 0xfe000000
#define IOBASE_END 0xfe600000 #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 * On the sun4/4c we need a place
* to reliably map locked down kernel data. This includes the * to reliably map locked down kernel data. This includes the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment