Commit 09087a1a authored by David Woodhouse's avatar David Woodhouse
Browse files

Fix exported headers for SPARC, SPARC64 



Mostly removing files which have no business being used in userspace.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 47dbec79

include/asm-sparc/Kbuild

+0 −7
Original line number Diff line number Diff line
@@ -2,20 +2,13 @@ include include/asm-generic/Kbuild.asm 


header-y += apc.h

header-y += asi.h

header-y += auxio.h

header-y += bpp.h

header-y += head.h

header-y += ipc.h

header-y += jsflash.h

header-y += openpromio.h

header-y += pbm.h

header-y += pconf.h

header-y += pgtsun4.h

header-y += reg.h

header-y += traps.h

header-y += turbosparc.h

header-y += vfc_ioctls.h

header-y += winmacro.h



unifdef-y += fbio.h

unifdef-y += perfctr.h

include/asm-sparc/page.h

+4 −4
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
#ifndef _SPARC_PAGE_H

#define _SPARC_PAGE_H



#ifdef __KERNEL__



#ifdef CONFIG_SUN4

#define PAGE_SHIFT   13

#else
@@ -21,8 +23,6 @@ 
#endif

#define PAGE_MASK    (~(PAGE_SIZE-1))



#ifdef __KERNEL__



#include <asm/btfixup.h>



#ifndef __ASSEMBLY__
@@ -160,9 +160,9 @@ extern unsigned long pfn_base; 
#define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \

				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)



#endif /* __KERNEL__ */



#include <asm-generic/memory_model.h>

#include <asm-generic/page.h>



#endif /* __KERNEL__ */



#endif /* _SPARC_PAGE_H */

include/asm-sparc64/Kbuild

+1 −4
Original line number Diff line number Diff line
@@ -8,15 +8,12 @@ header-y += apb.h 
header-y += asi.h

header-y += bbc.h

header-y += bpp.h

header-y += const.h

header-y += display7seg.h

header-y += envctrl.h

header-y += floppy.h

header-y += ipc.h

header-y += kdebug.h

header-y += mostek.h

header-y += openprom.h

header-y += openpromio.h

header-y += parport.h

header-y += pconf.h

header-y += psrcompat.h

header-y += pstate.h

include/asm-sparc64/page.h

+4 −5
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
#ifndef _SPARC64_PAGE_H

#define _SPARC64_PAGE_H



#ifdef __KERNEL__



#include <asm/const.h>



#if defined(CONFIG_SPARC64_PAGE_SIZE_8KB)
@@ -27,8 +29,6 @@ 
#define DCACHE_ALIASING_POSSIBLE

#endif



#ifdef __KERNEL__



#if defined(CONFIG_HUGETLB_PAGE_SIZE_4MB)

#define HPAGE_SHIFT		22

#elif defined(CONFIG_HUGETLB_PAGE_SIZE_512K)
@@ -141,8 +141,7 @@ typedef unsigned long pgprot_t; 
#define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \

				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)



#endif /* !(__KERNEL__) */



#include <asm-generic/page.h>



#endif /* !(_SPARC64_PAGE_H) */
 
#endif /* __KERNEL__ */

#endif /* _SPARC64_PAGE_H */

include/asm-sparc64/shmparam.h

+2 −0
Original line number Diff line number Diff line 
/* $Id: shmparam.h,v 1.5 2001/09/24 21:17:57 kanoj Exp $ */

#ifndef _ASMSPARC64_SHMPARAM_H

#define _ASMSPARC64_SHMPARAM_H

#ifdef __KERNEL__



#include <asm/spitfire.h>
@@ -8,4 +9,5 @@ 
/* attach addr a multiple of this */

#define	SHMLBA	((PAGE_SIZE > L1DCACHE_SIZE) ? PAGE_SIZE : L1DCACHE_SIZE)



#endif /* __KERNEL__ */

#endif /* _ASMSPARC64_SHMPARAM_H */