Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / arch / s390 / mm / pageattr.c

diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c
index c44171588d081444d724719208f366b24492cda0..f8c6faab41f4b3543ee0106ed39b6b0111af3d6e 100644 (file)
--- a/arch/s390/mm/pageattr.c
+++ b/arch/s390/mm/pageattr.c
@@ -14,7 +14,7 @@
 
 static inline unsigned long sske_frame(unsigned long addr, unsigned char skey)
 {
-       asm volatile(".insn rrf,0xb22b0000,%[skey],%[addr],9,0"
+       asm volatile(".insn rrf,0xb22b0000,%[skey],%[addr],1,0"
                     : [addr] "+a" (addr) : [skey] "d" (skey));
        return addr;
 }
@@ -23,8 +23,6 @@ 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 */
@@ -37,7 +35,7 @@ void __storage_key_init_range(unsigned long start, unsigned long end)
                                continue;
                        }
                }
-               page_set_storage_key(start, PAGE_DEFAULT_KEY, 0);
+               page_set_storage_key(start, PAGE_DEFAULT_KEY, 1);
                start += PAGE_SIZE;
        }
 }