aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/setup.h
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2013-04-30 13:19:58 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-05-03 08:21:15 -0400
commit996b4a7d8f4e5dd531369396f2312b97e9400cdc (patch)
treec827369c3cb23b84a3cd0528e534b4963c7639fa /arch/s390/include/asm/setup.h
parentd3383632d4e8e9ae747f582eaee8c2e79f828ae6 (diff)
s390/mem_detect: remove artificial kdump memory types
Simplify the memory detection code a bit by removing the CHUNK_OLDMEM and CHUNK_CRASHK memory types. They are not needed. Everything that is needed is a mechanism to insert holes into the detected memory. Reviewed-by: Michael Holzheu <holzheu@linux.vnet.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include/asm/setup.h')
-rw-r--r--arch/s390/include/asm/setup.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h
index 2765e40d8739..59880dbaf360 100644
--- a/arch/s390/include/asm/setup.h
+++ b/arch/s390/include/asm/setup.h
@@ -33,8 +33,6 @@
33 33
34#define CHUNK_READ_WRITE 0 34#define CHUNK_READ_WRITE 0
35#define CHUNK_READ_ONLY 1 35#define CHUNK_READ_ONLY 1
36#define CHUNK_OLDMEM 4
37#define CHUNK_CRASHK 5
38 36
39struct mem_chunk { 37struct mem_chunk {
40 unsigned long addr; 38 unsigned long addr;
@@ -47,8 +45,8 @@ extern int memory_end_set;
47extern unsigned long memory_end; 45extern unsigned long memory_end;
48 46
49void detect_memory_layout(struct mem_chunk chunk[], unsigned long maxsize); 47void detect_memory_layout(struct mem_chunk chunk[], unsigned long maxsize);
50void create_mem_hole(struct mem_chunk memory_chunk[], unsigned long addr, 48void create_mem_hole(struct mem_chunk mem_chunk[], unsigned long addr,
51 unsigned long size, int type); 49 unsigned long size);
52 50
53#define PRIMARY_SPACE_MODE 0 51#define PRIMARY_SPACE_MODE 0
54#define ACCESS_REGISTER_MODE 1 52#define ACCESS_REGISTER_MODE 1