diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-09 00:30:55 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-09 00:30:55 +0100 |
commit | d15c22e78674f9a5bc0de0932a43abe1aafae303 (patch) | |
tree | 3e4198c44bd2d9184e91647346c66aa95e28f843 /arch/s390/include/asm/setup.h | |
parent | Input: psmouse - add newline to OLPC HGPK touchpad debugging (diff) | |
parent | Linux 2.6.29-rc7 (diff) | |
download | linux-d15c22e78674f9a5bc0de0932a43abe1aafae303.tar.xz linux-d15c22e78674f9a5bc0de0932a43abe1aafae303.zip |
Merge commit 'v2.6.29-rc7' into next
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 { extern struct mem_chunk memory_chunk[]; extern unsigned long real_memory_size; +extern int memory_end_set; +extern unsigned long memory_end; void detect_memory_layout(struct mem_chunk chunk[]); |