diff options
-rw-r--r-- | arch/um/include/asm/sysrq.h (renamed from arch/um/include/shared/sysrq.h) | 0 | ||||
-rw-r--r-- | arch/um/kernel/sysrq.c | 2 | ||||
-rw-r--r-- | arch/x86/um/sysrq_32.c | 12 | ||||
-rw-r--r-- | arch/x86/um/sysrq_64.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/um/include/shared/sysrq.h b/arch/um/include/asm/sysrq.h index c8d332b56b98..c8d332b56b98 100644 --- a/arch/um/include/shared/sysrq.h +++ b/arch/um/include/asm/sysrq.h | |||
diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c index 0960de54495a..e562ff80409a 100644 --- a/arch/um/kernel/sysrq.c +++ b/arch/um/kernel/sysrq.c | |||
@@ -7,7 +7,7 @@ | |||
7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
8 | #include <linux/module.h> | 8 | #include <linux/module.h> |
9 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
10 | #include "sysrq.h" | 10 | #include <asm/sysrq.h> |
11 | 11 | ||
12 | /* Catch non-i386 SUBARCH's. */ | 12 | /* Catch non-i386 SUBARCH's. */ |
13 | #if !defined(CONFIG_UML_X86) || defined(CONFIG_64BIT) | 13 | #if !defined(CONFIG_UML_X86) || defined(CONFIG_64BIT) |
diff --git a/arch/x86/um/sysrq_32.c b/arch/x86/um/sysrq_32.c index 2d5cc51e9bef..c9bee5b8c0d3 100644 --- a/arch/x86/um/sysrq_32.c +++ b/arch/x86/um/sysrq_32.c | |||
@@ -3,12 +3,12 @@ | |||
3 | * Licensed under the GPL | 3 | * Licensed under the GPL |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "linux/kernel.h" | 6 | #include <linux/kernel.h> |
7 | #include "linux/smp.h" | 7 | #include <linux/smp.h> |
8 | #include "linux/sched.h" | 8 | #include <linux/sched.h> |
9 | #include "linux/kallsyms.h" | 9 | #include <linux/kallsyms.h> |
10 | #include "asm/ptrace.h" | 10 | #include <asm/ptrace.h> |
11 | #include "sysrq.h" | 11 | #include <asm/sysrq.h> |
12 | 12 | ||
13 | /* This is declared by <linux/sched.h> */ | 13 | /* This is declared by <linux/sched.h> */ |
14 | void show_regs(struct pt_regs *regs) | 14 | void show_regs(struct pt_regs *regs) |
diff --git a/arch/x86/um/sysrq_64.c b/arch/x86/um/sysrq_64.c index 08258f179969..a0e7fb1134a0 100644 --- a/arch/x86/um/sysrq_64.c +++ b/arch/x86/um/sysrq_64.c | |||
@@ -10,7 +10,7 @@ | |||
10 | #include <linux/utsname.h> | 10 | #include <linux/utsname.h> |
11 | #include <asm/current.h> | 11 | #include <asm/current.h> |
12 | #include <asm/ptrace.h> | 12 | #include <asm/ptrace.h> |
13 | #include "sysrq.h" | 13 | #include <asm/sysrq.h> |
14 | 14 | ||
15 | void __show_regs(struct pt_regs *regs) | 15 | void __show_regs(struct pt_regs *regs) |
16 | { | 16 | { |