From 3bb85db44bc6546b12f9bb50bc34fee6aad5030c Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Fri, 26 Feb 2010 22:37:44 +0100 Subject: [PATCH] --- yaml --- r: 182177 b: refs/heads/master c: 52499f40267e1178b3b2c887aee85c0c9fd01ec0 h: refs/heads/master i: 182175: a7d01b33a1c331bc176f31c47db11da7baf275d7 v: v3 --- [refs] | 2 +- trunk/arch/s390/Kconfig | 3 +++ trunk/arch/s390/include/asm/bug.h | 10 ++-------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 8900e56fcbbc..08861c97efee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbb870c8221147ae337612e04b2bb0211f31a74b +refs/heads/master: 52499f40267e1178b3b2c887aee85c0c9fd01ec0 diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig index c80235206c01..40334872f5ea 100644 --- a/trunk/arch/s390/Kconfig +++ b/trunk/arch/s390/Kconfig @@ -54,6 +54,9 @@ config GENERIC_BUG depends on BUG default y +config GENERIC_BUG_RELATIVE_POINTERS + def_bool y + config NO_IOMEM def_bool y diff --git a/trunk/arch/s390/include/asm/bug.h b/trunk/arch/s390/include/asm/bug.h index b1066b9fb5f8..9beeb9db9b23 100644 --- a/trunk/arch/s390/include/asm/bug.h +++ b/trunk/arch/s390/include/asm/bug.h @@ -5,12 +5,6 @@ #ifdef CONFIG_BUG -#ifdef CONFIG_64BIT -#define S390_LONG ".quad" -#else -#define S390_LONG ".long" -#endif - #ifdef CONFIG_DEBUG_BUGVERBOSE #define __EMIT_BUG(x) do { \ @@ -21,7 +15,7 @@ "2: .asciz \""__FILE__"\"\n" \ ".previous\n" \ ".section __bug_table,\"a\"\n" \ - "3:\t" S390_LONG "\t1b,2b\n" \ + "3: .long 1b-3b,2b-3b\n" \ " .short %0,%1\n" \ " .org 3b+%2\n" \ ".previous\n" \ @@ -37,7 +31,7 @@ "0: j 0b+2\n" \ "1:\n" \ ".section __bug_table,\"a\"\n" \ - "2:\t" S390_LONG "\t1b\n" \ + "2: .long 1b-2b\n" \ " .short %0\n" \ " .org 2b+%1\n" \ ".previous\n" \