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

Merge branch 'sh/stable-updates'

Browse Source 
Conflicts:
	arch/sh/kernel/dwarf.c
This commit is contained in:
Paul Mundt
2009-10-26 10:48:18 +09:00
parent 15893fb565 60339fad5c
commit 6253195b67
74 changed files with 592 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/sh/kernel/irq.c
View File

@@ -11,6 +11,7 @@
#include <linux/module.h>
#include <linux/kernel_stat.h>
#include <linux/seq_file.h>
#include <linux/ftrace.h>
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
@@ -114,7 +115,7 @@ static union irq_ctx *hardirq_ctx[NR_CPUS] __read_mostly;
static union irq_ctx *softirq_ctx[NR_CPUS] __read_mostly;
#endif
asmlinkage int do_IRQ(unsigned int irq, struct pt_regs *regs)
asmlinkage __irq_entry int do_IRQ(unsigned int irq, struct pt_regs *regs)
{
struct pt_regs *old_regs = set_irq_regs(regs);
#ifdef CONFIG_IRQSTACKS