diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 07:22:13 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 07:22:13 -0500 |
| commit | 4434e5156409eb3ec98f5ad7f0a0c07ebafe970d (patch) | |
| tree | c7f148cdae7a6cf4013253c6c2dbd1c49e837e32 /arch/s390/include/asm/setup.h | |
| parent | 2b8f836fb196acede88b6cc772e9057e0a9c0223 (diff) | |
| parent | 694593e3374a67d95ece6a275a1f181644c2c4d8 (diff) | |
Merge branches 'sched/cleanups', 'sched/urgent' and 'linus' into sched/core
Diffstat (limited to 'arch/s390/include/asm/setup.h')
| -rw-r--r-- | arch/s390/include/asm/setup.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h index 2bd9faeb3919..e8bd6ac22c99 100644 --- a/arch/s390/include/asm/setup.h +++ b/arch/s390/include/asm/setup.h | |||
| @@ -43,6 +43,8 @@ struct mem_chunk { | |||
| 43 | 43 | ||
| 44 | extern struct mem_chunk memory_chunk[]; | 44 | extern struct mem_chunk memory_chunk[]; |
| 45 | extern unsigned long real_memory_size; | 45 | extern unsigned long real_memory_size; |
| 46 | extern int memory_end_set; | ||
| 47 | extern unsigned long memory_end; | ||
| 46 | 48 | ||
| 47 | void detect_memory_layout(struct mem_chunk chunk[]); | 49 | void detect_memory_layout(struct mem_chunk chunk[]); |
| 48 | 50 | ||