git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[S390] Remove BUILD_BUG_ON() in vmem code.
[safe/jmp/linux-2.6]
/
arch
/
s390
/
kernel
/
setup.c
diff --git
a/arch/s390/kernel/setup.c
b/arch/s390/kernel/setup.c
index
72d20f7
..
29ae165
100644
(file)
--- a/
arch/s390/kernel/setup.c
+++ b/
arch/s390/kernel/setup.c
@@
-528,7
+528,7
@@
static void __init setup_memory_end(void)
memory_size = 0;
memory_end &= PAGE_MASK;
- max_mem = memory_end ? min(VM
ALLOC_START, memory_end) : VMALLOC_START
;
+ max_mem = memory_end ? min(VM
EM_MAX_PHYS, memory_end) : VMEM_MAX_PHYS
;
memory_end = min(max_mem, memory_end);
/*