Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 560285cd authored by Anton Blanchard's avatar Anton Blanchard Committed by Benjamin Herrenschmidt
Browse files

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: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 51cf2b30

arch/powerpc/include/asm/setup.h

0 → 100644
+33 −0
Original line number Original line Diff line number Diff line 
#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 */

arch/powerpc/include/uapi/asm/setup.h

+0 −31
Original line number Original line Diff line number Diff line 
#ifndef _ASM_POWERPC_SETUP_H

#define _ASM_POWERPC_SETUP_H



#include <asm-generic/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 */