diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /arch/cris/arch-v32/kernel/signal.c | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/uv
Diffstat (limited to 'arch/cris/arch-v32/kernel/signal.c')
| -rw-r--r-- | arch/cris/arch-v32/kernel/signal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c index 58c1866804e3..da7d2be000ba 100644 --- a/arch/cris/arch-v32/kernel/signal.c +++ b/arch/cris/arch-v32/kernel/signal.c | |||
| @@ -18,8 +18,8 @@ | |||
| 18 | #include <asm/processor.h> | 18 | #include <asm/processor.h> |
| 19 | #include <asm/ucontext.h> | 19 | #include <asm/ucontext.h> |
| 20 | #include <asm/uaccess.h> | 20 | #include <asm/uaccess.h> |
| 21 | #include <asm/arch/ptrace.h> | 21 | #include <arch/ptrace.h> |
| 22 | #include <asm/arch/hwregs/cpu_vect.h> | 22 | #include <arch/hwregs/cpu_vect.h> |
| 23 | 23 | ||
| 24 | extern unsigned long cris_signal_return_page; | 24 | extern unsigned long cris_signal_return_page; |
| 25 | 25 | ||