History

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

* '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

Linus Torvalds committed 16 years ago

Commit 352d4652 parents 95c46af 52869447 files · +5 −13Browse files

Unified · Split

7 files
  1. arch/alpha/include/asm/core_marvel.h +0 −1
  2. arch/alpha/include/asm/core_mcpcia.h +0 −1
  3. arch/alpha/include/asm/core_titan.h +0 −1
  4. arch/alpha/include/asm/core_tsunami.h +0 −1
  5. arch/alpha/kernel/sys_dp264.c +1 −1
  6. arch/alpha/kernel/sys_titan.c +1 −1
  7. arch/alpha/kernel/traps.c +3 −7
arch/alpha/include/asm/core_marvel.h+0−1
@@ -12,7 +12,6 @@ · 11 unmodified lines
1212 #define __ALPHA_MARVEL__H__
1313
1414 #include <linux/types.h>
15−#include <linux/pci.h>
1615 #include <linux/spinlock.h>
1716
1817 #include <asm/compiler.h>
arch/alpha/include/asm/core_mcpcia.h+0−1
@@ -6,7 +6,6 @@ · 5 unmodified lines
66 #define MCPCIA_ONE_HAE_WINDOW 1
77
88 #include <linux/types.h>
9−#include <linux/pci.h>
109 #include <asm/compiler.h>
1110
1211 /*
arch/alpha/include/asm/core_titan.h+0−1
@@ -2,7 +2,6 @@ · 1 unmodified line
22 #define __ALPHA_TITAN__H__
33
44 #include <linux/types.h>
5−#include <linux/pci.h>
65 #include <asm/compiler.h>
76
87 /*
arch/alpha/include/asm/core_tsunami.h+0−1
@@ -2,7 +2,6 @@ · 1 unmodified line
22 #define __ALPHA_TSUNAMI__H__
33
44 #include <linux/types.h>
5−#include <linux/pci.h>
65 #include <asm/compiler.h>
76
87 /*
arch/alpha/kernel/sys_dp264.c+1−1
@@ -224,7 +224,7 @@ static void · 223 unmodified lines
224224 dp264_device_interrupt(unsigned long vector)
225225 {
226226 #if 1
227− printk("dp264_device_interrupt: NOT IMPLEMENTED YET!! \n");
227+ printk("dp264_device_interrupt: NOT IMPLEMENTED YET!!\n");
228228 #else
229229 unsigned long pld;
230230 unsigned int i;
arch/alpha/kernel/sys_titan.c+1−1
@@ -171,7 +171,7 @@ titan_set_irq_affinity(unsigned int irq, const struct cpumask *affinity) · 170 unmodified lines
171171 static void
172172 titan_device_interrupt(unsigned long vector)
173173 {
174− printk("titan_device_interrupt: NOT IMPLEMENTED YET!! \n");
174+ printk("titan_device_interrupt: NOT IMPLEMENTED YET!!\n");
175175 }
176176
177177 static void
arch/alpha/kernel/traps.c+3−7
@@ -17,6 +17,7 @@ · 16 unmodified lines
1717 #include <linux/module.h>
1818 #include <linux/init.h>
1919 #include <linux/kallsyms.h>
20+#include <linux/ratelimit.h>
2021
2122 #include <asm/gentrap.h>
2223 #include <asm/uaccess.h>
@@ -771,8 +772,7 @@ asmlinkage void · 748 unmodified lines
771772 do_entUnaUser(void __user * va, unsigned long opcode,
772773 unsigned long reg, struct pt_regs *regs)
773774 {
774− static int cnt = 0;
775− static unsigned long last_time;
775+ static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
776776
777777 unsigned long tmp1, tmp2, tmp3, tmp4;
778778 unsigned long fake_reg, *reg_addr = &fake_reg;
@@ -783,15 +783,11 @@ do_entUnaUser(void __user * va, unsigned long opcode, · 4 unmodified lines
783783 with the unaliged access. */
784784
785785 if (!test_thread_flag (TIF_UAC_NOPRINT)) {
786− if (cnt >= 5 && time_after(jiffies, last_time + 5 * HZ)) {
787− cnt = 0;
788− }
789− if (++cnt < 5) {
786+ if (__ratelimit(&ratelimit)) {
790787 printk("%s(%d): unaligned trap at %016lx: %p %lx %ld\n",
791788 current->comm, task_pid_nr(current),
792789 regs->pc - 4, va, opcode, reg);
793790 }
794− last_time = jiffies;
795791 }
796792 if (test_thread_flag (TIF_UAC_SIGBUS))
797793 goto give_sigbus;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t