s390/mm: fix compile for PAGE_DEFAULT_KEY != 0

heicarst · Martin Schwidefsky · commit de3fa841e429 · 2016-06-14T16:54:05.000+02:00
The usual problem for code that is ifdef'ed out is that it doesn't
compile after a while. That's also the case for the storage key
initialisation code, if it would be used (set PAGE_DEFAULT_KEY to
something not zero):

./arch/s390/include/asm/page.h: In function 'storage_key_init_range':
./arch/s390/include/asm/page.h:36:2: error: implicit declaration of function '__storage_key_init_range'

Since the code itself has been useful for debugging purposes several
times, remove the ifdefs and make sure the code gets compiler
coverage. The cost for this is eight bytes.

Signed-off-by: Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt;
Signed-off-by: Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;
diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h
@@ -30,11 +30,12 @@
 #include <asm/setup.h>
 #ifndef __ASSEMBLY__
 
+void __storage_key_init_range(unsigned long start, unsigned long end);
+
 static inline void storage_key_init_range(unsigned long start, unsigned long end)
 {
-#if PAGE_DEFAULT_KEY
-	__storage_key_init_range(start, end);
-#endif
+	if (PAGE_DEFAULT_KEY)
+		__storage_key_init_range(start, end);
 }
 
 #define clear_page(page)	memset((page), 0, PAGE_SIZE)
diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c
@@ -10,7 +10,6 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 
-#if PAGE_DEFAULT_KEY
 static inline unsigned long sske_frame(unsigned long addr, unsigned char skey)
 {
 	asm volatile(".insn rrf,0xb22b0000,%[skey],%[addr],9,0"
@@ -22,6 +21,8 @@ void __storage_key_init_range(unsigned long start, unsigned long end)
 {
 	unsigned long boundary, size;
 
+	if (!PAGE_DEFAULT_KEY)
+		return;
 	while (start < end) {
 		if (MACHINE_HAS_EDAT1) {
 			/* set storage keys for a 1MB frame */
@@ -38,7 +39,6 @@ void __storage_key_init_range(unsigned long start, unsigned long end)
 		start += PAGE_SIZE;
 	}
 }
-#endif
 
 #ifdef CONFIG_PROC_FS
 atomic_long_t direct_pages_count[PG_DIRECT_MAP_MAX];

Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,12 @@`
`30`	`30`	`#include <asm/setup.h>`
`31`	`31`	`#ifndef __ASSEMBLY__`
`32`	`32`
	`33`	`+void __storage_key_init_range(unsigned long start, unsigned long end);`
	`34`	`+`
`33`	`35`	`static inline void storage_key_init_range(unsigned long start, unsigned long end)`
`34`	`36`	`{`
`35`		`-#if PAGE_DEFAULT_KEY`
`36`		`- __storage_key_init_range(start, end);`
`37`		`-#endif`
	`37`	`+ if (PAGE_DEFAULT_KEY)`
	`38`	`+ __storage_key_init_range(start, end);`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`#define clear_page(page) memset((page), 0, PAGE_SIZE)`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`#include <asm/pgtable.h>`
`11`	`11`	`#include <asm/page.h>`
`12`	`12`
`13`		`-#if PAGE_DEFAULT_KEY`
`14`	`13`	`static inline unsigned long sske_frame(unsigned long addr, unsigned char skey)`
`15`	`14`	`{`
`16`	`15`	`asm volatile(".insn rrf,0xb22b0000,%[skey],%[addr],9,0"`
`@@ -22,6 +21,8 @@ void __storage_key_init_range(unsigned long start, unsigned long end)`
`22`	`21`	`{`
`23`	`22`	`unsigned long boundary, size;`
`24`	`23`
	`24`	`+ if (!PAGE_DEFAULT_KEY)`
	`25`	`+ return;`
`25`	`26`	`while (start < end) {`
`26`	`27`	`if (MACHINE_HAS_EDAT1) {`
`27`	`28`	`/* set storage keys for a 1MB frame */`
`@@ -38,7 +39,6 @@ void __storage_key_init_range(unsigned long start, unsigned long end)`
`38`	`39`	`start += PAGE_SIZE;`
`39`	`40`	`}`
`40`	`41`	`}`
`41`		`-#endif`
`42`	`42`
`43`	`43`	`#ifdef CONFIG_PROC_FS`
`44`	`44`	`atomic_long_t direct_pages_count[PG_DIRECT_MAP_MAX];`