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
12#define __ALPHA_MARVEL__H__12#define __ALPHA_MARVEL__H__
13 13
14#include <linux/types.h>14#include <linux/types.h>
15#include <linux/pci.h>
16#include <linux/spinlock.h>15#include <linux/spinlock.h>
17 16
18#include <asm/compiler.h>17#include <asm/compiler.h>
arch/alpha/include/asm/core_mcpcia.h+0−1
@@ -6,7 +6,6 @@ · 5 unmodified lines
6#define MCPCIA_ONE_HAE_WINDOW 16#define MCPCIA_ONE_HAE_WINDOW 1
7 7
8#include <linux/types.h>8#include <linux/types.h>
9#include <linux/pci.h>
10#include <asm/compiler.h>9#include <asm/compiler.h>
11 10
12/*11/*
arch/alpha/include/asm/core_titan.h+0−1
@@ -2,7 +2,6 @@ · 1 unmodified line
2#define __ALPHA_TITAN__H__2#define __ALPHA_TITAN__H__
3 3
4#include <linux/types.h>4#include <linux/types.h>
5#include <linux/pci.h>
6#include <asm/compiler.h>5#include <asm/compiler.h>
7 6
8/*7/*
arch/alpha/include/asm/core_tsunami.h+0−1
@@ -2,7 +2,6 @@ · 1 unmodified line
2#define __ALPHA_TSUNAMI__H__2#define __ALPHA_TSUNAMI__H__
3 3
4#include <linux/types.h>4#include <linux/types.h>
5#include <linux/pci.h>
6#include <asm/compiler.h>5#include <asm/compiler.h>
7 6
8/*7/*
arch/alpha/kernel/sys_dp264.c+1−1
@@ -224,7 +224,7 @@ static void · 223 unmodified lines
224dp264_device_interrupt(unsigned long vector)224dp264_device_interrupt(unsigned long vector)
225{225{
226#if 1226#if 1
227 printk("dp264_device_interrupt: NOT IMPLEMENTED YET!! \n");227 printk("dp264_device_interrupt: NOT IMPLEMENTED YET!!\n");
228#else228#else
229 unsigned long pld;229 unsigned long pld;
230 unsigned int i;230 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
171static void171static void
172titan_device_interrupt(unsigned long vector)172titan_device_interrupt(unsigned long vector)
173{173{
174 printk("titan_device_interrupt: NOT IMPLEMENTED YET!! \n");174 printk("titan_device_interrupt: NOT IMPLEMENTED YET!!\n");
175}175}
176 176
177static void 177static void
arch/alpha/kernel/traps.c+3−7
@@ -17,6 +17,7 @@ · 16 unmodified lines
17#include <linux/module.h>17#include <linux/module.h>
18#include <linux/init.h>18#include <linux/init.h>
19#include <linux/kallsyms.h>19#include <linux/kallsyms.h>
20#include <linux/ratelimit.h>
20 21
21#include <asm/gentrap.h>22#include <asm/gentrap.h>
22#include <asm/uaccess.h>23#include <asm/uaccess.h>
@@ -771,8 +772,7 @@ asmlinkage void · 748 unmodified lines
771do_entUnaUser(void __user * va, unsigned long opcode,772do_entUnaUser(void __user * va, unsigned long opcode,
772 unsigned long reg, struct pt_regs *regs)773 unsigned long reg, struct pt_regs *regs)
773{774{
774 static int cnt = 0;775 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
775 static unsigned long last_time;
776 776
777 unsigned long tmp1, tmp2, tmp3, tmp4;777 unsigned long tmp1, tmp2, tmp3, tmp4;
778 unsigned long fake_reg, *reg_addr = &fake_reg;778 unsigned long fake_reg, *reg_addr = &fake_reg;
@@ -783,15 +783,11 @@ do_entUnaUser(void __user * va, unsigned long opcode, · 4 unmodified lines
783 with the unaliged access. */783 with the unaliged access. */
784 784
785 if (!test_thread_flag (TIF_UAC_NOPRINT)) {785 if (!test_thread_flag (TIF_UAC_NOPRINT)) {
786 if (cnt >= 5 && time_after(jiffies, last_time + 5 * HZ)) {786 if (__ratelimit(&ratelimit)) {
787 cnt = 0;
788 }
789 if (++cnt < 5) {
790 printk("%s(%d): unaligned trap at %016lx: %p %lx %ld\n",787 printk("%s(%d): unaligned trap at %016lx: %p %lx %ld\n",
791 current->comm, task_pid_nr(current),788 current->comm, task_pid_nr(current),
792 regs->pc - 4, va, opcode, reg);789 regs->pc - 4, va, opcode, reg);
793 }790 }
794 last_time = jiffies;
795 }791 }
796 if (test_thread_flag (TIF_UAC_SIGBUS))792 if (test_thread_flag (TIF_UAC_SIGBUS))
797 goto give_sigbus;793 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