diff options
| author | Al Viro <viro@ZenIV.linux.org.uk> | 2012-10-08 04:26:54 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2012-10-09 22:28:19 +0200 |
| commit | 382d95fdfa7ff5c54f6495c597c7cf6d124e404b (patch) | |
| tree | c5de4aba2209bd6dcf2cd23ea2ff2b0f6a69a7ee | |
| parent | um/x86: merge 32 and 64 bit variants of ptrace.h (diff) | |
| download | linux-382d95fdfa7ff5c54f6495c597c7cf6d124e404b.tar.xz linux-382d95fdfa7ff5c54f6495c597c7cf6d124e404b.zip | |
um: move sysrq.h out of include/shared
never used by userland-side objects
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
| -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 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/sched.h> -#include "sysrq.h" +#include <asm/sysrq.h> /* Catch non-i386 SUBARCH's. */ #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 @@ * Licensed under the GPL */ -#include "linux/kernel.h" -#include "linux/smp.h" -#include "linux/sched.h" -#include "linux/kallsyms.h" -#include "asm/ptrace.h" -#include "sysrq.h" +#include <linux/kernel.h> +#include <linux/smp.h> +#include <linux/sched.h> +#include <linux/kallsyms.h> +#include <asm/ptrace.h> +#include <asm/sysrq.h> /* This is declared by <linux/sched.h> */ 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 @@ #include <linux/utsname.h> #include <asm/current.h> #include <asm/ptrace.h> -#include "sysrq.h" +#include <asm/sysrq.h> void __show_regs(struct pt_regs *regs) { |