diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 13:08:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 13:08:46 -0400 |
| commit | 8ed575904373d7aaab7f15a8db2edc317a44df43 (patch) | |
| tree | 3b2e92a396a1bbec8e1fb499f25e8aed93ab5692 /arch/parisc/lib/fixup.S | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
| parent | 210cc679faf0e1cabda9fc5d1279644f5e52aecb (diff) | |
Merge branch 'forlinus' of git://parisc-linux.org/home/kyle/git/parisc-2.6
Diffstat (limited to 'arch/parisc/lib/fixup.S')
| -rw-r--r-- | arch/parisc/lib/fixup.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S index 1b91612ed964..e0661c2978ed 100644 --- a/arch/parisc/lib/fixup.S +++ b/arch/parisc/lib/fixup.S | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | extrd,u \t2,63,32,\t2 | 35 | extrd,u \t2,63,32,\t2 |
| 36 | #endif | 36 | #endif |
| 37 | /* t2 = &__per_cpu_offset[smp_processor_id()]; */ | 37 | /* t2 = &__per_cpu_offset[smp_processor_id()]; */ |
| 38 | LDREG,s \t2(\t1),\t2 | 38 | LDREGX \t2(\t1),\t2 |
| 39 | addil LT%per_cpu__exception_data,%r27 | 39 | addil LT%per_cpu__exception_data,%r27 |
| 40 | LDREG RT%per_cpu__exception_data(%r1),\t1 | 40 | LDREG RT%per_cpu__exception_data(%r1),\t1 |
| 41 | /* t1 = &__get_cpu_var(exception_data) */ | 41 | /* t1 = &__get_cpu_var(exception_data) */ |
| @@ -53,6 +53,8 @@ | |||
| 53 | .endm | 53 | .endm |
| 54 | #endif | 54 | #endif |
| 55 | 55 | ||
| 56 | .level LEVEL | ||
| 57 | |||
| 56 | .text | 58 | .text |
| 57 | .section .fixup, "ax" | 59 | .section .fixup, "ax" |
| 58 | 60 | ||