Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4aa5ac4e authored by Matt Fleming's avatar Matt Fleming Committed by Paul Mundt
Browse files

sh: Only shout about fixing up unexpected unaligned accesses 



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: default avatarMatt Fleming <matt@console-pimps.org>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent e79d5747

arch/sh/include/asm/system_32.h

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ do { \ 
#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,

arch/sh/kernel/io_trapped.c

+2 −1
Original line number Diff line number Diff line
@@ -284,7 +284,8 @@ int handle_trapped_io(struct pt_regs *regs, unsigned long address) 
		return 0;

	}



	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;

}

arch/sh/kernel/traps_32.c

+5 −4
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static inline int handle_delayslot(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)

			    struct mem_access *ma, int expected)

{

	u_int rm;

	int ret, index;
@@ -458,7 +458,7 @@ int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs, 
	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",
@@ -657,7 +657,7 @@ asmlinkage void do_address_error(struct pt_regs *regs, 


		set_fs(USER_DS);

		tmp = handle_unaligned_access(instruction, regs,

					      &user_mem_access);

					      &user_mem_access, 0);

		set_fs(oldfs);



		if (tmp==0)
@@ -694,7 +694,8 @@ asmlinkage void do_address_error(struct pt_regs *regs, 
			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);

		set_fs(oldfs);

	}

}