From a10d148bf538efb66beb10ed220b90548545ccb0 Mon Sep 17 00:00:00 2001
From: Grant Grundler <grundler@parisc-linux.org>
Date: Fri, 21 Oct 2005 22:56:35 -0400
Subject: [PATCH] --- yaml --- r: 10511 b: refs/heads/master c:
 61520e1f8f5ec3a78510a3254947324711944b98 h: refs/heads/master i:   10509:
 1861c350e83d0fbb51c16468aec94b17946269ad   10507:
 61e6e69afc267cc301f491bb1830a7dbe5cbd4e1   10503:
 72436a7a8f1a59c1d4138b7a8d594a84861f6b5f   10495:
 8e066536663c73083726a5ab9d7b08ee7a57f9fd v: v3

---
 [refs]                              | 2 +-
 trunk/arch/parisc/lib/fixup.S       | 4 +++-
 trunk/include/asm-parisc/assembly.h | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 114c70f43e0d..b4349fc82951 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e635c96ed6c972e1b3cb0c0fc3681c1204697287
+refs/heads/master: 61520e1f8f5ec3a78510a3254947324711944b98
diff --git a/trunk/arch/parisc/lib/fixup.S b/trunk/arch/parisc/lib/fixup.S
index 1b91612ed964..e0661c2978ed 100644
--- a/trunk/arch/parisc/lib/fixup.S
+++ b/trunk/arch/parisc/lib/fixup.S
@@ -35,7 +35,7 @@
 	extrd,u \t2,63,32,\t2
 #endif
 	/* t2 = &__per_cpu_offset[smp_processor_id()]; */
-	LDREG,s \t2(\t1),\t2 
+	LDREGX \t2(\t1),\t2 
 	addil LT%per_cpu__exception_data,%r27
 	LDREG RT%per_cpu__exception_data(%r1),\t1
 	/* t1 = &__get_cpu_var(exception_data) */
@@ -53,6 +53,8 @@
 	.endm
 #endif
 
+	.level LEVEL
+
 	.text
 	.section .fixup, "ax"
 
diff --git a/trunk/include/asm-parisc/assembly.h b/trunk/include/asm-parisc/assembly.h
index fb8bc7c16e0e..3ce3440d1b0c 100644
--- a/trunk/include/asm-parisc/assembly.h
+++ b/trunk/include/asm-parisc/assembly.h
@@ -22,7 +22,8 @@
 #define _PARISC_ASSEMBLY_H
 
 #define CALLEE_FLOAT_FRAME_SIZE	80
-#ifdef __LP64__
+
+#ifdef CONFIG_64BIT
 #define LDREG	ldd
 #define STREG	std
 #define LDREGX  ldd,s
@@ -32,7 +33,7 @@
 #define RP_OFFSET	16
 #define FRAME_SIZE	128
 #define CALLEE_REG_FRAME_SIZE	144
-#else
+#else	/* CONFIG_64BIT */
 #define LDREG	ldw
 #define STREG	stw
 #define LDREGX  ldwx,s
@@ -43,6 +44,7 @@
 #define FRAME_SIZE	64
 #define CALLEE_REG_FRAME_SIZE	128
 #endif
+
 #define CALLEE_SAVE_FRAME_SIZE (CALLEE_REG_FRAME_SIZE + CALLEE_FLOAT_FRAME_SIZE)
 
 #ifdef CONFIG_PA20