diff options
Diffstat (limited to 'arch/s390/include/asm/setup.h')
-rw-r--r-- | arch/s390/include/asm/setup.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h index 8cfd731a18d8..55ad134bcedf 100644 --- a/arch/s390/include/asm/setup.h +++ b/arch/s390/include/asm/setup.h | |||
@@ -2,15 +2,11 @@ | |||
2 | * S390 version | 2 | * S390 version |
3 | * Copyright IBM Corp. 1999, 2010 | 3 | * Copyright IBM Corp. 1999, 2010 |
4 | */ | 4 | */ |
5 | |||
6 | #ifndef _ASM_S390_SETUP_H | 5 | #ifndef _ASM_S390_SETUP_H |
7 | #define _ASM_S390_SETUP_H | 6 | #define _ASM_S390_SETUP_H |
8 | 7 | ||
9 | #define COMMAND_LINE_SIZE 4096 | 8 | #include <uapi/asm/setup.h> |
10 | |||
11 | #define ARCH_COMMAND_LINE_SIZE 896 | ||
12 | 9 | ||
13 | #ifdef __KERNEL__ | ||
14 | 10 | ||
15 | #define PARMAREA 0x10400 | 11 | #define PARMAREA 0x10400 |
16 | #define MEMORY_CHUNKS 256 | 12 | #define MEMORY_CHUNKS 256 |
@@ -173,5 +169,4 @@ extern void (*_machine_power_off)(void); | |||
173 | #define COMMAND_LINE 0x10480 | 169 | #define COMMAND_LINE 0x10480 |
174 | 170 | ||
175 | #endif /* __ASSEMBLY__ */ | 171 | #endif /* __ASSEMBLY__ */ |
176 | #endif /* __KERNEL__ */ | ||
177 | #endif /* _ASM_S390_SETUP_H */ | 172 | #endif /* _ASM_S390_SETUP_H */ |