git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into core/printk
[sfrench/cifs-2.6.git]
/
arch
/
s390
/
include
/
asm
/
setup.h
diff --git
a/arch/s390/include/asm/setup.h
b/arch/s390/include/asm/setup.h
index 2bd9faeb3919a0a3b7fae325769c3042db144d44..e8bd6ac22c996e40378654d7bdad1b9824ac826f 100644
(file)
--- 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[]);