git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
[safe/jmp/linux-2.6]
/
arch
/
parisc
/
lib
/
fixup.S
diff --git
a/arch/parisc/lib/fixup.S
b/arch/parisc/lib/fixup.S
index
1b91612
..
ecce3d3
100644
(file)
--- a/
arch/parisc/lib/fixup.S
+++ b/
arch/parisc/lib/fixup.S
@@
-19,7
+19,6
@@
*
* Fixup routines for kernel exception handling.
*/
*
* Fixup routines for kernel exception handling.
*/
-#include <linux/config.h>
#include <asm/asm-offsets.h>
#include <asm/assembly.h>
#include <asm/errno.h>
#include <asm/asm-offsets.h>
#include <asm/assembly.h>
#include <asm/errno.h>
@@
-35,7
+34,7
@@
extrd,u \t2,63,32,\t2
#endif
/* t2 = &__per_cpu_offset[smp_processor_id()]; */
extrd,u \t2,63,32,\t2
#endif
/* t2 = &__per_cpu_offset[smp_processor_id()]; */
- LDREG
,s
\t2(\t1),\t2
+ LDREG
X
\t2(\t1),\t2
addil LT%per_cpu__exception_data,%r27
LDREG RT%per_cpu__exception_data(%r1),\t1
/* t1 = &__get_cpu_var(exception_data) */
addil LT%per_cpu__exception_data,%r27
LDREG RT%per_cpu__exception_data(%r1),\t1
/* t1 = &__get_cpu_var(exception_data) */
@@
-53,6
+52,8
@@
.endm
#endif
.endm
#endif
+ .level LEVEL
+
.text
.section .fixup, "ax"
.text
.section .fixup, "ax"