diff options
Diffstat (limited to 'include/asm-s390/setup.h')
-rw-r--r-- | include/asm-s390/setup.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/include/asm-s390/setup.h b/include/asm-s390/setup.h index 5d72eda8a11b..9574fe80a046 100644 --- a/include/asm-s390/setup.h +++ b/include/asm-s390/setup.h | |||
@@ -2,18 +2,19 @@ | |||
2 | * include/asm-s390/setup.h | 2 | * include/asm-s390/setup.h |
3 | * | 3 | * |
4 | * S390 version | 4 | * S390 version |
5 | * Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation | 5 | * Copyright IBM Corp. 1999,2006 |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #ifndef _ASM_S390_SETUP_H | 8 | #ifndef _ASM_S390_SETUP_H |
9 | #define _ASM_S390_SETUP_H | 9 | #define _ASM_S390_SETUP_H |
10 | 10 | ||
11 | #define COMMAND_LINE_SIZE 896 | ||
12 | |||
11 | #ifdef __KERNEL__ | 13 | #ifdef __KERNEL__ |
12 | 14 | ||
13 | #include <asm/types.h> | 15 | #include <asm/types.h> |
14 | 16 | ||
15 | #define PARMAREA 0x10400 | 17 | #define PARMAREA 0x10400 |
16 | #define COMMAND_LINE_SIZE 896 | ||
17 | #define MEMORY_CHUNKS 16 /* max 0x7fff */ | 18 | #define MEMORY_CHUNKS 16 /* max 0x7fff */ |
18 | #define IPL_PARMBLOCK_ORIGIN 0x2000 | 19 | #define IPL_PARMBLOCK_ORIGIN 0x2000 |
19 | 20 | ||
@@ -30,6 +31,17 @@ | |||
30 | #endif /* __s390x__ */ | 31 | #endif /* __s390x__ */ |
31 | #define COMMAND_LINE ((char *) (0x10480)) | 32 | #define COMMAND_LINE ((char *) (0x10480)) |
32 | 33 | ||
34 | #define CHUNK_READ_WRITE 0 | ||
35 | #define CHUNK_READ_ONLY 1 | ||
36 | |||
37 | struct mem_chunk { | ||
38 | unsigned long addr; | ||
39 | unsigned long size; | ||
40 | unsigned long type; | ||
41 | }; | ||
42 | |||
43 | extern struct mem_chunk memory_chunk[]; | ||
44 | |||
33 | /* | 45 | /* |
34 | * Machine features detected in head.S | 46 | * Machine features detected in head.S |
35 | */ | 47 | */ |
@@ -53,7 +65,6 @@ extern unsigned long machine_flags; | |||
53 | #define MACHINE_HAS_MVCOS (machine_flags & 512) | 65 | #define MACHINE_HAS_MVCOS (machine_flags & 512) |
54 | #endif /* __s390x__ */ | 66 | #endif /* __s390x__ */ |
55 | 67 | ||
56 | |||
57 | #define MACHINE_HAS_SCLP (!MACHINE_IS_P390) | 68 | #define MACHINE_HAS_SCLP (!MACHINE_IS_P390) |
58 | 69 | ||
59 | /* | 70 | /* |
@@ -71,7 +82,6 @@ extern unsigned int console_irq; | |||
71 | #define SET_CONSOLE_3215 do { console_mode = 2; } while (0) | 82 | #define SET_CONSOLE_3215 do { console_mode = 2; } while (0) |
72 | #define SET_CONSOLE_3270 do { console_mode = 3; } while (0) | 83 | #define SET_CONSOLE_3270 do { console_mode = 3; } while (0) |
73 | 84 | ||
74 | |||
75 | struct ipl_list_hdr { | 85 | struct ipl_list_hdr { |
76 | u32 len; | 86 | u32 len; |
77 | u8 reserved1[3]; | 87 | u8 reserved1[3]; |