Some unaligned accesses are completely expected. For example, the
trapped_io code uses the unaligned access fixup code path so there's no
need to warn about having to fixup the unaligned access.
Signed-off-by: Matt Fleming <matt@console-pimps.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
#endif
int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs,
#endif
int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs,
- struct mem_access *ma);
+ struct mem_access *ma, int);
asmlinkage void do_address_error(struct pt_regs *regs,
unsigned long writeaccess,
asmlinkage void do_address_error(struct pt_regs *regs,
unsigned long writeaccess,
- tmp = handle_unaligned_access(instruction, regs, &trapped_io_access);
+ tmp = handle_unaligned_access(instruction, regs,
+ &trapped_io_access, 1);
set_fs(oldfs);
return tmp == 0;
}
set_fs(oldfs);
return tmp == 0;
}
#define SH_PC_12BIT_OFFSET(instr) ((((signed short)(instr<<4))>>3) + 4)
int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs,
#define SH_PC_12BIT_OFFSET(instr) ((((signed short)(instr<<4))>>3) + 4)
int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs,
+ struct mem_access *ma, int expected)
{
u_int rm;
int ret, index;
{
u_int rm;
int ret, index;
rm = regs->regs[index];
/* shout about fixups */
rm = regs->regs[index];
/* shout about fixups */
- if (printk_ratelimit())
+ if (!expected && printk_ratelimit())
printk(KERN_NOTICE "Fixing up unaligned %s access "
"in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
user_mode(regs) ? "userspace" : "kernel",
printk(KERN_NOTICE "Fixing up unaligned %s access "
"in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
user_mode(regs) ? "userspace" : "kernel",
set_fs(USER_DS);
tmp = handle_unaligned_access(instruction, regs,
set_fs(USER_DS);
tmp = handle_unaligned_access(instruction, regs,
set_fs(oldfs);
if (tmp==0)
set_fs(oldfs);
if (tmp==0)
die("insn faulting in do_address_error", regs, 0);
}
die("insn faulting in do_address_error", regs, 0);
}
- handle_unaligned_access(instruction, regs, &user_mem_access);
+ handle_unaligned_access(instruction, regs,
+ &user_mem_access, 0);