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

Commit 352d4657 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 95c46afe 5286944d

arch/alpha/include/asm/core_marvel.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#define __ALPHA_MARVEL__H__



#include <linux/types.h>

#include <linux/pci.h>

#include <linux/spinlock.h>



#include <asm/compiler.h>

arch/alpha/include/asm/core_mcpcia.h

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#define MCPCIA_ONE_HAE_WINDOW 1



#include <linux/types.h>

#include <linux/pci.h>

#include <asm/compiler.h>



/*

arch/alpha/include/asm/core_titan.h

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#define __ALPHA_TITAN__H__



#include <linux/types.h>

#include <linux/pci.h>

#include <asm/compiler.h>



/*

arch/alpha/include/asm/core_tsunami.h

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#define __ALPHA_TSUNAMI__H__



#include <linux/types.h>

#include <linux/pci.h>

#include <asm/compiler.h>



/*

arch/alpha/kernel/traps.c

+3 −7
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/module.h>

#include <linux/init.h>

#include <linux/kallsyms.h>

#include <linux/ratelimit.h>



#include <asm/gentrap.h>

#include <asm/uaccess.h>
@@ -771,8 +772,7 @@ asmlinkage void 
do_entUnaUser(void __user * va, unsigned long opcode,

	      unsigned long reg, struct pt_regs *regs)

{

	static int cnt = 0;

	static unsigned long last_time;

	static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);



	unsigned long tmp1, tmp2, tmp3, tmp4;

	unsigned long fake_reg, *reg_addr = &fake_reg;
@@ -783,15 +783,11 @@ do_entUnaUser(void __user * va, unsigned long opcode, 
	   with the unaliged access.  */



	if (!test_thread_flag (TIF_UAC_NOPRINT)) {

		if (cnt >= 5 && time_after(jiffies, last_time + 5 * HZ)) {

			cnt = 0;

		}

		if (++cnt < 5) {

		if (__ratelimit(&ratelimit)) {

			printk("%s(%d): unaligned trap at %016lx: %p %lx %ld\n",

			       current->comm, task_pid_nr(current),

			       regs->pc - 4, va, opcode, reg);

		}

		last_time = jiffies;

	}

	if (test_thread_flag (TIF_UAC_SIGBUS))

		goto give_sigbus;

arch/alpha/kernel/sys_dp264.c

+1 −1

File changed.

Contains only whitespace changes.

arch/alpha/kernel/sys_titan.c

+1 −1

File changed.

Contains only whitespace changes.