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

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

arch/sparc/kernel/entry.S

+1 −0
Original line number Diff line number Diff line
@@ -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

include/asm-sparc/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -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

include/asm-sparc/openprom.h

+0 −2
Original line number Diff line number Diff line
@@ -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

include/asm-sparc/pgtable.h

+6 −1
Original line number Diff line number Diff line
@@ -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

include/asm-sparc/vaddrs.h

+0 −5
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE