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

c6x: remove internal kernel symbols from exported setup.h

Some internal kernel symbols were referenced in the exported setup.h.
This splits out the internal bits from the exported uapi bits.

Signed-off-by: Mark Salter <msalter@redhat.com>

+36 -30
+33
arch/c6x/include/asm/setup.h
··· 1 + /* 2 + * Port on Texas Instruments TMS320C6x architecture 3 + * 4 + * Copyright (C) 2004, 2009, 2010 2011 Texas Instruments Incorporated 5 + * Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com) 6 + * 7 + * This program is free software; you can redistribute it and/or modify 8 + * it under the terms of the GNU General Public License version 2 as 9 + * published by the Free Software Foundation. 10 + */ 11 + #ifndef _ASM_C6X_SETUP_H 12 + #define _ASM_C6X_SETUP_H 13 + 14 + #include <uapi/asm/setup.h> 15 + 16 + #ifndef __ASSEMBLY__ 17 + extern char c6x_command_line[COMMAND_LINE_SIZE]; 18 + 19 + extern int c6x_add_memory(phys_addr_t start, unsigned long size); 20 + 21 + extern unsigned long ram_start; 22 + extern unsigned long ram_end; 23 + 24 + extern int c6x_num_cores; 25 + extern unsigned int c6x_silicon_rev; 26 + extern unsigned int c6x_devstat; 27 + extern unsigned char c6x_fuse_mac[6]; 28 + 29 + extern void machine_init(unsigned long dt_ptr); 30 + extern void time_init(void); 31 + 32 + #endif /* !__ASSEMBLY__ */ 33 + #endif /* _ASM_C6X_SETUP_H */
+3 -30
arch/c6x/include/uapi/asm/setup.h
··· 1 - /* 2 - * Port on Texas Instruments TMS320C6x architecture 3 - * 4 - * Copyright (C) 2004, 2009, 2010 2011 Texas Instruments Incorporated 5 - * Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com) 6 - * 7 - * This program is free software; you can redistribute it and/or modify 8 - * it under the terms of the GNU General Public License version 2 as 9 - * published by the Free Software Foundation. 10 - */ 11 - #ifndef _ASM_C6X_SETUP_H 12 - #define _ASM_C6X_SETUP_H 1 + #ifndef _UAPI_ASM_C6X_SETUP_H 2 + #define _UAPI_ASM_C6X_SETUP_H 13 3 14 4 #define COMMAND_LINE_SIZE 1024 15 5 16 - #ifndef __ASSEMBLY__ 17 - extern char c6x_command_line[COMMAND_LINE_SIZE]; 18 - 19 - extern int c6x_add_memory(phys_addr_t start, unsigned long size); 20 - 21 - extern unsigned long ram_start; 22 - extern unsigned long ram_end; 23 - 24 - extern int c6x_num_cores; 25 - extern unsigned int c6x_silicon_rev; 26 - extern unsigned int c6x_devstat; 27 - extern unsigned char c6x_fuse_mac[6]; 28 - 29 - extern void machine_init(unsigned long dt_ptr); 30 - extern void time_init(void); 31 - 32 - #endif /* !__ASSEMBLY__ */ 33 - #endif /* _ASM_C6X_SETUP_H */ 6 + #endif /* _UAPI_ASM_C6X_SETUP_H */