diff options
| author | Sam Ravnborg | 2012-05-25 23:20:16 +0200 |
|---|---|---|
| committer | David S. Miller | 2012-05-28 08:52:49 +0200 |
| commit | 1ec8cf62338b950fdbf76bbdfa3064bc1c0b7a81 (patch) | |
| tree | 38209aea44a013707f2530802cefd233afcf0f81 /arch/sparc/kernel/entry.S | |
| parent | sparc32,leon: fix section mismatch warning (diff) | |
| download | kernel-qcow2-linux-1ec8cf62338b950fdbf76bbdfa3064bc1c0b7a81.tar.gz kernel-qcow2-linux-1ec8cf62338b950fdbf76bbdfa3064bc1c0b7a81.tar.xz kernel-qcow2-linux-1ec8cf62338b950fdbf76bbdfa3064bc1c0b7a81.zip | |
sparc32: introduce support for run-time patching for all shared assembler code
All users of MMUREGS ASI in kernel/ now uses run-time patching.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Daniel Hellstrom <daniel@gaisler.com>
Cc: Konrad Eisele <konrad@gaisler.com>
Diffstat (limited to 'arch/sparc/kernel/entry.S')
| -rw-r--r-- | arch/sparc/kernel/entry.S | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S index 8550f10af453..dcaa1cf0de40 100644 --- a/arch/sparc/kernel/entry.S +++ b/arch/sparc/kernel/entry.S @@ -767,8 +767,11 @@ srmmu_fault: mov 0x400, %l5 mov 0x300, %l4 - lda [%l5] ASI_M_MMUREGS, %l6 ! read sfar first - lda [%l4] ASI_M_MMUREGS, %l5 ! read sfsr last +LEON_PI(lda [%l5] ASI_LEON_MMUREGS, %l6) ! read sfar first +SUN_PI_(lda [%l5] ASI_M_MMUREGS, %l6) ! read sfar first + +LEON_PI(lda [%l4] ASI_LEON_MMUREGS, %l5) ! read sfsr last +SUN_PI_(lda [%l4] ASI_M_MMUREGS, %l5) ! read sfsr last andn %l6, 0xfff, %l6 srl %l5, 6, %l5 ! and encode all info into l7 |