s390: convert to generic entry

[linux-2.6-microblaze.git] / arch / s390 / lib / uaccess.c

diff --git a/arch/s390/lib/uaccess.c b/arch/s390/lib/uaccess.c
index e8f6424..2fece1f 100644 (file)
--- a/arch/s390/lib/uaccess.c
+++ b/arch/s390/lib/uaccess.c
@@ -16,8 +16,8 @@
 #include <asm/mmu_context.h>
 #include <asm/facility.h>
 
-#ifdef CONFIG_DEBUG_USER_ASCE
-void debug_user_asce(void)
+#ifdef CONFIG_DEBUG_ENTRY
+void debug_user_asce(int exit)
 {
        unsigned long cr1, cr7;
 
@@ -25,12 +25,14 @@ void debug_user_asce(void)
        __ctl_store(cr7, 7, 7);
        if (cr1 == S390_lowcore.kernel_asce && cr7 == S390_lowcore.user_asce)
                return;
-       panic("incorrect ASCE on kernel exit\n"
+       panic("incorrect ASCE on kernel %s\n"
              "cr1:    %016lx cr7:  %016lx\n"
              "kernel: %016llx user: %016llx\n",
-             cr1, cr7, S390_lowcore.kernel_asce, S390_lowcore.user_asce);
+             exit ? "exit" : "entry", cr1, cr7,
+             S390_lowcore.kernel_asce, S390_lowcore.user_asce);
+
 }
-#endif /*CONFIG_DEBUG_USER_ASCE */
+#endif /*CONFIG_DEBUG_ENTRY */
 
 #ifndef CONFIG_HAVE_MARCH_Z10_FEATURES
 static DEFINE_STATIC_KEY_FALSE(have_mvcos);