Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6-omap-h63xx.git] / include / asm-s390 / processor.h

diff --git a/include/asm-s390/processor.h b/include/asm-s390/processor.h
index cbbd114716723729107014b56eda0eca3f043159..fb46e9090b500bc2405ca4660dbfb6040188dceb 100644 (file)
--- a/include/asm-s390/processor.h
+++ b/include/asm-s390/processor.h
@@ -74,8 +74,6 @@ extern struct task_struct *last_task_used_math;
 
 #endif /* __s390x__ */
 
-#define MM_VM_SIZE(mm)         DEFAULT_TASK_SIZE
-
 #define HAVE_ARCH_PICK_MMAP_LAYOUT
 
 typedef struct {
@@ -247,7 +245,7 @@ static inline void enabled_wait(void)
        psw_t wait_psw;
 
        wait_psw.mask = PSW_BASE_BITS | PSW_MASK_IO | PSW_MASK_EXT |
-               PSW_MASK_MCHECK | PSW_MASK_WAIT;
+               PSW_MASK_MCHECK | PSW_MASK_WAIT | PSW_DEFAULT_KEY;
 #ifndef __s390x__
        asm volatile (
                "    basr %0,0\n"