diff options
author | Arnd Bergmann <arnd@arndb.de> | 2005-12-16 16:43:46 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-01-08 23:13:08 -0500 |
commit | 88ced0314938814e1772b4d0d7ab20c52e4472b6 (patch) | |
tree | 3e06de882c0bf5706ee7a8994e06eb8c9ed3feca /include/asm-powerpc/nvram.h | |
parent | e1333803c3a8fb167ba67ffc5540dbb53fa7deb3 (diff) |
[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 { | |||
55 | char name[12]; | 55 | char name[12]; |
56 | }; | 56 | }; |
57 | 57 | ||
58 | #ifdef __KERNEL__ | ||
58 | struct nvram_partition { | 59 | struct nvram_partition { |
59 | struct list_head partition; | 60 | struct list_head partition; |
60 | struct nvram_header header; | 61 | struct nvram_header header; |
@@ -69,6 +70,7 @@ extern struct nvram_partition *nvram_find_partition(int sig, const char *name); | |||
69 | 70 | ||
70 | extern int pSeries_nvram_init(void); | 71 | extern int pSeries_nvram_init(void); |
71 | extern int mmio_nvram_init(void); | 72 | extern int mmio_nvram_init(void); |
73 | #endif /* __KERNEL__ */ | ||
72 | 74 | ||
73 | /* PowerMac specific nvram stuffs */ | 75 | /* PowerMac specific nvram stuffs */ |
74 | 76 | ||
@@ -78,6 +80,7 @@ enum { | |||
78 | pmac_nvram_NR /* MacOS Name Registry partition */ | 80 | pmac_nvram_NR /* MacOS Name Registry partition */ |
79 | }; | 81 | }; |
80 | 82 | ||
83 | #ifdef __KERNEL__ | ||
81 | /* Return partition offset in nvram */ | 84 | /* Return partition offset in nvram */ |
82 | extern int pmac_get_partition(int partition); | 85 | extern int pmac_get_partition(int partition); |
83 | 86 | ||
@@ -91,6 +94,7 @@ extern void nvram_sync(void); | |||
91 | /* Normal access to NVRAM */ | 94 | /* Normal access to NVRAM */ |
92 | extern unsigned char nvram_read_byte(int i); | 95 | extern unsigned char nvram_read_byte(int i); |
93 | extern void nvram_write_byte(unsigned char c, int i); | 96 | extern void nvram_write_byte(unsigned char c, int i); |
97 | #endif | ||
94 | 98 | ||
95 | /* Some offsets in XPRAM */ | 99 | /* Some offsets in XPRAM */ |
96 | #define PMAC_XPRAM_MACHINE_LOC 0xe4 | 100 | #define PMAC_XPRAM_MACHINE_LOC 0xe4 |