diff options
Diffstat (limited to 'arch/sh/mm/alignment.c')
| -rw-r--r-- | arch/sh/mm/alignment.c | 11 | 
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/sh/mm/alignment.c b/arch/sh/mm/alignment.c index b2595b8548e..ec2b2530242 100644 --- a/arch/sh/mm/alignment.c +++ b/arch/sh/mm/alignment.c @@ -13,6 +13,7 @@  #include <linux/seq_file.h>  #include <linux/proc_fs.h>  #include <linux/uaccess.h> +#include <linux/ratelimit.h>  #include <asm/alignment.h>  #include <asm/processor.h> @@ -95,13 +96,13 @@ int set_unalign_ctl(struct task_struct *tsk, unsigned int val)  void unaligned_fixups_notify(struct task_struct *tsk, insn_size_t insn,  			     struct pt_regs *regs)  { -	if (user_mode(regs) && (se_usermode & UM_WARN) && printk_ratelimit()) -		pr_notice("Fixing up unaligned userspace access " +	if (user_mode(regs) && (se_usermode & UM_WARN)) +		pr_notice_ratelimited("Fixing up unaligned userspace access "  			  "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",  			  tsk->comm, task_pid_nr(tsk),  			  (void *)instruction_pointer(regs), insn); -	else if (se_kernmode_warn && printk_ratelimit()) -		pr_notice("Fixing up unaligned kernel access " +	else if (se_kernmode_warn) +		pr_notice_ratelimited("Fixing up unaligned kernel access "  			  "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",  			  tsk->comm, task_pid_nr(tsk),  			  (void *)instruction_pointer(regs), insn); @@ -139,7 +140,7 @@ static int alignment_proc_open(struct inode *inode, struct file *file)  static ssize_t alignment_proc_write(struct file *file,  		const char __user *buffer, size_t count, loff_t *pos)  { -	int *data = PDE(file->f_path.dentry->d_inode)->data; +	int *data = PDE_DATA(file_inode(file));  	char mode;  	if (count > 0) {  | 
