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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
  alpha: fix compile errors in dma-mapping-common.h
  alpha: remove trailing spaces in messages
  alpha: use __ratelimit
This commit is contained in:
Linus Torvalds
2010-03-19 13:49:29 -07:00
parent 95c46afe60 5286944d75
commit 352d4657b2
7 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/alpha/include/asm/core_marvel.h
View File

@@ -12,7 +12,6 @@
#define __ALPHA_MARVEL__H__ #define __ALPHA_MARVEL__H__
#include <linux/types.h> #include <linux/types.h>
#include <linux/pci.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <asm/compiler.h> #include <asm/compiler.h>

1
arch/alpha/include/asm/core_mcpcia.h
View File

@@ -6,7 +6,6 @@
#define MCPCIA_ONE_HAE_WINDOW 1 #define MCPCIA_ONE_HAE_WINDOW 1
#include <linux/types.h> #include <linux/types.h>
#include <linux/pci.h>
#include <asm/compiler.h> #include <asm/compiler.h>
/* /*

1
arch/alpha/include/asm/core_titan.h
View File

@@ -2,7 +2,6 @@
#define __ALPHA_TITAN__H__ #define __ALPHA_TITAN__H__
#include <linux/types.h> #include <linux/types.h>
#include <linux/pci.h>
#include <asm/compiler.h> #include <asm/compiler.h>
/* /*

1
arch/alpha/include/asm/core_tsunami.h
View File

@@ -2,7 +2,6 @@
#define __ALPHA_TSUNAMI__H__ #define __ALPHA_TSUNAMI__H__
#include <linux/types.h> #include <linux/types.h>
#include <linux/pci.h>
#include <asm/compiler.h> #include <asm/compiler.h>
/* /*

10
arch/alpha/kernel/traps.c
View File

@@ -17,6 +17,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
#include <linux/ratelimit.h>
#include <asm/gentrap.h> #include <asm/gentrap.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
@@ -771,8 +772,7 @@ asmlinkage void
do_entUnaUser(void __user * va, unsigned long opcode, do_entUnaUser(void __user * va, unsigned long opcode,
unsigned long reg, struct pt_regs *regs) unsigned long reg, struct pt_regs *regs)
{ {
static int cnt = 0; static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
static unsigned long last_time;
unsigned long tmp1, tmp2, tmp3, tmp4; unsigned long tmp1, tmp2, tmp3, tmp4;
unsigned long fake_reg, *reg_addr = &fake_reg; unsigned long fake_reg, *reg_addr = &fake_reg;
@@ -783,15 +783,11 @@ do_entUnaUser(void __user * va, unsigned long opcode,
with the unaliged access. */ with the unaliged access. */
if (!test_thread_flag (TIF_UAC_NOPRINT)) { if (!test_thread_flag (TIF_UAC_NOPRINT)) {
if (cnt >= 5 && time_after(jiffies, last_time + 5 * HZ)) { if (__ratelimit(&ratelimit)) {
cnt = 0;
}
if (++cnt < 5) {
printk("%s(%d): unaligned trap at %016lx: %p %lx %ld\n", printk("%s(%d): unaligned trap at %016lx: %p %lx %ld\n",
current->comm, task_pid_nr(current), current->comm, task_pid_nr(current),
regs->pc - 4, va, opcode, reg); regs->pc - 4, va, opcode, reg);
} }
last_time = jiffies;
} }
if (test_thread_flag (TIF_UAC_SIGBUS)) if (test_thread_flag (TIF_UAC_SIGBUS))
goto give_sigbus; goto give_sigbus;