Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Anton Blanchard and committed by
Benjamin Herrenschmidt
560285cd 51cf2b30

+33 -31
+33
arch/powerpc/include/asm/setup.h
··· 1 + #ifndef _ASM_POWERPC_SETUP_H 2 + #define _ASM_POWERPC_SETUP_H 3 + 4 + #include <uapi/asm/setup.h> 5 + 6 + #ifndef __ASSEMBLY__ 7 + extern void ppc_printk_progress(char *s, unsigned short hex); 8 + 9 + extern unsigned int rtas_data; 10 + extern int mem_init_done; /* set on boot once kmalloc can be called */ 11 + extern int init_bootmem_done; /* set once bootmem is available */ 12 + extern unsigned long long memory_limit; 13 + extern unsigned long klimit; 14 + extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask); 15 + 16 + extern void via_cuda_init(void); 17 + extern void read_rtc_time(void); 18 + extern void pmac_find_display(void); 19 + 20 + struct device_node; 21 + extern void note_scsi_host(struct device_node *, void *); 22 + 23 + /* Used in very early kernel initialization. */ 24 + extern unsigned long reloc_offset(void); 25 + extern unsigned long add_reloc_offset(unsigned long); 26 + extern void reloc_got2(unsigned long); 27 + 28 + #define PTRRELOC(x) ((typeof(x)) add_reloc_offset((unsigned long)(x))) 29 + 30 + #endif /* !__ASSEMBLY__ */ 31 + 32 + #endif /* _ASM_POWERPC_SETUP_H */ 33 +
-31
arch/powerpc/include/uapi/asm/setup.h
··· 1 - #ifndef _ASM_POWERPC_SETUP_H 2 - #define _ASM_POWERPC_SETUP_H 3 - 4 1 #include <asm-generic/setup.h> 5 - 6 - #ifndef __ASSEMBLY__ 7 - extern void ppc_printk_progress(char *s, unsigned short hex); 8 - 9 - extern unsigned int rtas_data; 10 - extern int mem_init_done; /* set on boot once kmalloc can be called */ 11 - extern int init_bootmem_done; /* set once bootmem is available */ 12 - extern unsigned long long memory_limit; 13 - extern unsigned long klimit; 14 - extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask); 15 - 16 - extern void via_cuda_init(void); 17 - extern void read_rtc_time(void); 18 - extern void pmac_find_display(void); 19 - 20 - struct device_node; 21 - extern void note_scsi_host(struct device_node *, void *); 22 - 23 - /* Used in very early kernel initialization. */ 24 - extern unsigned long reloc_offset(void); 25 - extern unsigned long add_reloc_offset(unsigned long); 26 - extern void reloc_got2(unsigned long); 27 - 28 - #define PTRRELOC(x) ((typeof(x)) add_reloc_offset((unsigned long)(x))) 29 - 30 - #endif /* !__ASSEMBLY__ */ 31 - 32 - #endif /* _ASM_POWERPC_SETUP_H */