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 tag 's390-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[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 70bd65724ec4c06310380465c39709f6d3b73ff5..6dc6c4fbc8e2b1a59796afb96bff120d4c0f8a21 100644
(file)
--- a/
arch/s390/include/asm/setup.h
+++ b/
arch/s390/include/asm/setup.h
@@
-83,6
+83,7
@@
struct parmarea {
extern int noexec_disabled;
extern int memory_end_set;
extern unsigned long memory_end;
+extern unsigned long vmalloc_size;
extern unsigned long max_physmem_end;
extern unsigned long __swsusp_reset_dma;