diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-05-26 17:29:58 -0400 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-05-26 17:29:58 -0400 |
| commit | a463f9a9e04385f0729f7435a0a6dff7d89b25de (patch) | |
| tree | 00ff42c305926c800e18b13df8440a4de1a1a041 /arch | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
GPUSync patch for Litmus 2012.1.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/irq.c | 4 | ||||
| -rw-r--r-- | arch/x86/kernel/syscall_table_32.S | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 6c0802eb2f7f..680a5cb4b585 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c | |||
| @@ -10,6 +10,10 @@ | |||
| 10 | #include <linux/ftrace.h> | 10 | #include <linux/ftrace.h> |
| 11 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
| 12 | 12 | ||
| 13 | #ifdef CONFIG_LITMUS_NVIDIA | ||
| 14 | #include <litmus/sched_trace.h> | ||
| 15 | #endif | ||
| 16 | |||
| 13 | #include <asm/apic.h> | 17 | #include <asm/apic.h> |
| 14 | #include <asm/io_apic.h> | 18 | #include <asm/io_apic.h> |
| 15 | #include <asm/irq.h> | 19 | #include <asm/irq.h> |
diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S index d0126222b394..0cb4373698e7 100644 --- a/arch/x86/kernel/syscall_table_32.S +++ b/arch/x86/kernel/syscall_table_32.S | |||
| @@ -358,3 +358,4 @@ ENTRY(sys_call_table) | |||
| 358 | .long sys_wait_for_ts_release | 358 | .long sys_wait_for_ts_release |
| 359 | .long sys_release_ts /* +10 */ | 359 | .long sys_release_ts /* +10 */ |
| 360 | .long sys_null_call | 360 | .long sys_null_call |
| 361 | .long sys_register_nv_device | ||