From 382d95fdfa7ff5c54f6495c597c7cf6d124e404b Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 8 Oct 2012 03:26:54 +0100 Subject: [PATCH] um: move sysrq.h out of include/shared never used by userland-side objects Signed-off-by: Al Viro Signed-off-by: Richard Weinberger --- arch/um/include/{shared => asm}/sysrq.h | 0 arch/um/kernel/sysrq.c | 2 +- arch/x86/um/sysrq_32.c | 12 ++++++------ arch/x86/um/sysrq_64.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename arch/um/include/{shared => asm}/sysrq.h (100%) diff --git a/arch/um/include/shared/sysrq.h b/arch/um/include/asm/sysrq.h similarity index 100% rename from arch/um/include/shared/sysrq.h rename to 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 #include #include -#include "sysrq.h" +#include /* 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 +#include +#include +#include +#include +#include /* This is declared by */ 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 #include #include -#include "sysrq.h" +#include void __show_regs(struct pt_regs *regs) { -- 2.30.2