diff options
author | Joel Becker <jlbec@evilplan.org> | 2011-08-22 06:02:57 +0200 |
---|---|---|
committer | Joel Becker <jlbec@evilplan.org> | 2011-08-22 06:02:57 +0200 |
commit | 99b1bb61b225c3eb4d3b196d4f1d041695b19a7e (patch) | |
tree | 06cabdc34538f3b38a39e3b802ecc1a2ab2aae00 /arch/arm/include/asm/traps.h | |
parent | ocfs2: Avoid livelock in ocfs2_readpage() (diff) | |
parent | ocfs2: Implement llseek() (diff) | |
download | linux-99b1bb61b225c3eb4d3b196d4f1d041695b19a7e.tar.xz linux-99b1bb61b225c3eb4d3b196d4f1d041695b19a7e.zip |
Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-fixes
Diffstat (limited to 'arch/arm/include/asm/traps.h')
-rw-r--r-- | arch/arm/include/asm/traps.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/include/asm/traps.h b/arch/arm/include/asm/traps.h index f90756dc16dc..5b29a6673625 100644 --- a/arch/arm/include/asm/traps.h +++ b/arch/arm/include/asm/traps.h @@ -3,6 +3,9 @@ #include <linux/list.h> +struct pt_regs; +struct task_struct; + struct undef_hook { struct list_head node; u32 instr_mask; |