lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SPARC64]: Fix bug in unaligned load endianness swapping

Browse Source 
The in-memory value was being swapped, not the value we
loaded into the register.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2005-09-28 16:48:40 -07:00
parent d2212bc7db
commit 705747ab87
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/sparc64/kernel/unaligned.c
View File

@@ -294,7 +294,7 @@ asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn, u
kernel_mna_trap_fault(); kernel_mna_trap_fault();
} else { } else {
unsigned long addr; unsigned long addr, *reg_addr;
int orig_asi, asi; int orig_asi, asi;
addr = compute_effective_address(regs, insn, addr = compute_effective_address(regs, insn,
@@ -319,11 +319,11 @@ asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn, u
}; };
switch (dir) { switch (dir) {
case load: case load:
do_int_load(fetch_reg_addr(((insn>>25)&0x1f), regs), reg_addr = fetch_reg_addr(((insn>>25)&0x1f), regs);
size, (unsigned long *) addr, do_int_load(reg_addr, size, (unsigned long *) addr,
decode_signedness(insn), asi); decode_signedness(insn), asi);
if (unlikely(asi != orig_asi)) { if (unlikely(asi != orig_asi)) {
unsigned long val_in = *(unsigned long *) addr; unsigned long val_in = *reg_addr;
switch (size) { switch (size) {
case 2: case 2:
val_in = swab16(val_in); val_in = swab16(val_in);
@@ -339,7 +339,7 @@ asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn, u
BUG(); BUG();
break; break;
}; };
*(unsigned long *) addr = val_in; *reg_addr = val_in;
} }
break; break;