-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
powerpc: Move most of setup.h out of uapi
Most of setup.h should not be exported to userspace, so move it back. All we are left with is the asm-generic include to pick up the COMMAND_LINE_SIZE define. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
- Loading branch information
Anton Blanchard
authored and
Benjamin Herrenschmidt
committed
Nov 15, 2012
1 parent
51cf2b3
commit 560285c
Showing
2 changed files
with
33 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| #ifndef _ASM_POWERPC_SETUP_H | ||
| #define _ASM_POWERPC_SETUP_H | ||
|
|
||
| #include <uapi/asm/setup.h> | ||
|
|
||
| #ifndef __ASSEMBLY__ | ||
| extern void ppc_printk_progress(char *s, unsigned short hex); | ||
|
|
||
| extern unsigned int rtas_data; | ||
| extern int mem_init_done; /* set on boot once kmalloc can be called */ | ||
| extern int init_bootmem_done; /* set once bootmem is available */ | ||
| extern unsigned long long memory_limit; | ||
| extern unsigned long klimit; | ||
| extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask); | ||
|
|
||
| extern void via_cuda_init(void); | ||
| extern void read_rtc_time(void); | ||
| extern void pmac_find_display(void); | ||
|
|
||
| struct device_node; | ||
| extern void note_scsi_host(struct device_node *, void *); | ||
|
|
||
| /* Used in very early kernel initialization. */ | ||
| extern unsigned long reloc_offset(void); | ||
| extern unsigned long add_reloc_offset(unsigned long); | ||
| extern void reloc_got2(unsigned long); | ||
|
|
||
| #define PTRRELOC(x) ((typeof(x)) add_reloc_offset((unsigned long)(x))) | ||
|
|
||
| #endif /* !__ASSEMBLY__ */ | ||
|
|
||
| #endif /* _ASM_POWERPC_SETUP_H */ | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1 @@ | ||
| #ifndef _ASM_POWERPC_SETUP_H | ||
| #define _ASM_POWERPC_SETUP_H | ||
|
|
||
| #include <asm-generic/setup.h> | ||
|
|
||
| #ifndef __ASSEMBLY__ | ||
| extern void ppc_printk_progress(char *s, unsigned short hex); | ||
|
|
||
| extern unsigned int rtas_data; | ||
| extern int mem_init_done; /* set on boot once kmalloc can be called */ | ||
| extern int init_bootmem_done; /* set once bootmem is available */ | ||
| extern unsigned long long memory_limit; | ||
| extern unsigned long klimit; | ||
| extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask); | ||
|
|
||
| extern void via_cuda_init(void); | ||
| extern void read_rtc_time(void); | ||
| extern void pmac_find_display(void); | ||
|
|
||
| struct device_node; | ||
| extern void note_scsi_host(struct device_node *, void *); | ||
|
|
||
| /* Used in very early kernel initialization. */ | ||
| extern unsigned long reloc_offset(void); | ||
| extern unsigned long add_reloc_offset(unsigned long); | ||
| extern void reloc_got2(unsigned long); | ||
|
|
||
| #define PTRRELOC(x) ((typeof(x)) add_reloc_offset((unsigned long)(x))) | ||
|
|
||
| #endif /* !__ASSEMBLY__ */ | ||
|
|
||
| #endif /* _ASM_POWERPC_SETUP_H */ |