diff options
author | Arnd Bergmann <arnd@arndb.de> | 2005-12-16 22:43:46 +0100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-01-09 05:13:08 +0100 |
commit | 88ced0314938814e1772b4d0d7ab20c52e4472b6 (patch) | |
tree | 3e06de882c0bf5706ee7a8994e06eb8c9ed3feca /include/asm-powerpc/nvram.h | |
parent | [PATCH] powerpc: Fix iSeries bug in VMALLOCBASE/VMALLOC_START consolidation (diff) | |
download | linux-88ced0314938814e1772b4d0d7ab20c52e4472b6.tar.xz linux-88ced0314938814e1772b4d0d7ab20c52e4472b6.zip |
[PATCH] powerpc: sanitize header files for user space includes
include/asm-ppc/ had #ifdef __KERNEL__ in all header files that
are not meant for use by user space, include/asm-powerpc does
not have this yet.
This patch gets us a lot closer there. There are a few cases
where I was not sure, so I left them out. I have verified
that no CONFIG_* symbols are used outside of __KERNEL__
any more and that there are no obvious compile errors when
including any of the headers in user space libraries.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/nvram.h')
-rw-r--r-- | include/asm-powerpc/nvram.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-powerpc/nvram.h b/include/asm-powerpc/nvram.h index 24bd8c2388ea..f3563e11e260 100644 --- a/include/asm-powerpc/nvram.h +++ b/include/asm-powerpc/nvram.h @@ -55,6 +55,7 @@ struct nvram_header { char name[12]; }; +#ifdef __KERNEL__ struct nvram_partition { struct list_head partition; struct nvram_header header; @@ -69,6 +70,7 @@ extern struct nvram_partition *nvram_find_partition(int sig, const char *name); extern int pSeries_nvram_init(void); extern int mmio_nvram_init(void); +#endif /* __KERNEL__ */ /* PowerMac specific nvram stuffs */ @@ -78,6 +80,7 @@ enum { pmac_nvram_NR /* MacOS Name Registry partition */ }; +#ifdef __KERNEL__ /* Return partition offset in nvram */ extern int pmac_get_partition(int partition); @@ -91,6 +94,7 @@ extern void nvram_sync(void); /* Normal access to NVRAM */ extern unsigned char nvram_read_byte(int i); extern void nvram_write_byte(unsigned char c, int i); +#endif /* Some offsets in XPRAM */ #define PMAC_XPRAM_MACHINE_LOC 0xe4 |