aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/setup.h
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-12-14 17:37:13 -0500
committerDavid Howells <dhowells@redhat.com>2012-12-14 17:37:13 -0500
commitaf170c5061dd78512c469e6e2d211980cdb2c193 (patch)
treea3bb86ee66b69f832b6783124cc0482ce8058cd8 /arch/x86/include/asm/setup.h
parentd42b3a2906a10b732ea7d7f849d49be79d242ef0 (diff)
UAPI: (Scripted) Disintegrate arch/x86/include/asm
Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Michael Kerrisk <mtk.manpages@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/x86/include/asm/setup.h')
-rw-r--r--arch/x86/include/asm/setup.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index d0f19f9fb846..b7bf3505e1ec 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -1,7 +1,8 @@
1#ifndef _ASM_X86_SETUP_H 1#ifndef _ASM_X86_SETUP_H
2#define _ASM_X86_SETUP_H 2#define _ASM_X86_SETUP_H
3 3
4#ifdef __KERNEL__ 4#include <uapi/asm/setup.h>
5
5 6
6#define COMMAND_LINE_SIZE 2048 7#define COMMAND_LINE_SIZE 2048
7 8
@@ -123,6 +124,4 @@ void __init x86_64_start_reservations(char *real_mode_data);
123 .size .brk.name,.-1b; \ 124 .size .brk.name,.-1b; \
124 .popsection 125 .popsection
125#endif /* __ASSEMBLY__ */ 126#endif /* __ASSEMBLY__ */
126#endif /* __KERNEL__ */
127
128#endif /* _ASM_X86_SETUP_H */ 127#endif /* _ASM_X86_SETUP_H */