diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/parisc/lib/fixup.S | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/parisc/lib/fixup.S')
| -rw-r--r-- | arch/parisc/lib/fixup.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S index d172d4245cdc..f8c45cc2947d 100644 --- a/arch/parisc/lib/fixup.S +++ b/arch/parisc/lib/fixup.S | |||
| @@ -36,8 +36,8 @@ | |||
| 36 | #endif | 36 | #endif |
| 37 | /* t2 = &__per_cpu_offset[smp_processor_id()]; */ | 37 | /* t2 = &__per_cpu_offset[smp_processor_id()]; */ |
| 38 | LDREGX \t2(\t1),\t2 | 38 | LDREGX \t2(\t1),\t2 |
| 39 | addil LT%per_cpu__exception_data,%r27 | 39 | addil LT%exception_data,%r27 |
| 40 | LDREG RT%per_cpu__exception_data(%r1),\t1 | 40 | LDREG RT%exception_data(%r1),\t1 |
| 41 | /* t1 = &__get_cpu_var(exception_data) */ | 41 | /* t1 = &__get_cpu_var(exception_data) */ |
| 42 | add,l \t1,\t2,\t1 | 42 | add,l \t1,\t2,\t1 |
| 43 | /* t1 = t1->fault_ip */ | 43 | /* t1 = t1->fault_ip */ |
| @@ -46,8 +46,8 @@ | |||
| 46 | #else | 46 | #else |
| 47 | .macro get_fault_ip t1 t2 | 47 | .macro get_fault_ip t1 t2 |
| 48 | /* t1 = &__get_cpu_var(exception_data) */ | 48 | /* t1 = &__get_cpu_var(exception_data) */ |
| 49 | addil LT%per_cpu__exception_data,%r27 | 49 | addil LT%exception_data,%r27 |
| 50 | LDREG RT%per_cpu__exception_data(%r1),\t2 | 50 | LDREG RT%exception_data(%r1),\t2 |
| 51 | /* t1 = t2->fault_ip */ | 51 | /* t1 = t2->fault_ip */ |
| 52 | LDREG EXCDATA_IP(\t2), \t1 | 52 | LDREG EXCDATA_IP(\t2), \t1 |
| 53 | .endm | 53 | .endm |