Merge branch 'orion' into devel

[sfrench/cifs-2.6.git] / include / asm-s390 / setup.h

diff --git a/include/asm-s390/setup.h b/include/asm-s390/setup.h
index 44c7aee2bd340151824a13281f0da91129847b8a..a76a6b8fd887e259a62681053f058c850c3b54d4 100644 (file)
--- a/include/asm-s390/setup.h
+++ b/include/asm-s390/setup.h
@@ -40,6 +40,7 @@ struct mem_chunk {
 };
 
 extern struct mem_chunk memory_chunk[];
+extern unsigned long real_memory_size;
 
 #ifdef CONFIG_S390_SWITCH_AMODE
 extern unsigned int switch_amode;
@@ -77,6 +78,7 @@ extern unsigned long machine_flags;
 #endif /* __s390x__ */
 
 #define MACHINE_HAS_SCLP       (!MACHINE_IS_P390)
+#define ZFCPDUMP_HSA_SIZE      (32UL<<20)
 
 /*
  * Console mode. Override with conmode=