Message ID | 5587B4FB.3040609@nod.at |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
Richard Weinberger <richard@nod.at> writes: > While riding the bus to my office I've materialized that idea. > Nicolai, can you please give the attached patch a try? W/o my test_bpf patch applied, w/ your patch applied: - linux mainline: um compiles - linux-next: um compiles up to this mfd/syscon issue communicated to you in sidechannel In particular, your patch fixes, next to [0], the issue addressed by my patch. -> My 1K line regexp replace patch reduces to a debatable naming style patch. Drop it, sorry for the noise. [0] http://lkml.kernel.org/r/1420386535-22530-1-git-send-email-richard@nod.at -- To unsubscribe from this list: send the line "unsubscribe netdev" in
From: Nicolai Stange <nicstange@gmail.com> Date: Mon, 22 Jun 2015 15:47:12 +0200 > Richard Weinberger <richard@nod.at> writes: >> While riding the bus to my office I've materialized that idea. >> Nicolai, can you please give the attached patch a try? > W/o my test_bpf patch applied, w/ your patch applied: > - linux mainline: um compiles > - linux-next: um compiles up to this mfd/syscon issue communicated to > you in sidechannel > > In particular, your patch fixes, next to [0], the issue addressed by my > patch. > > -> My 1K line regexp replace patch reduces to a debatable naming style > patch. Drop it, sorry for the noise. > > [0] http://lkml.kernel.org/r/1420386535-22530-1-git-send-email-richard@nod.at Ok, I'll revert this then. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/um/include/asm/ptrace-generic.h b/arch/um/include/asm/ptrace-generic.h index cb9b3c4..7485162 100644 --- a/arch/um/include/asm/ptrace-generic.h +++ b/arch/um/include/asm/ptrace-generic.h @@ -8,7 +8,6 @@ #ifndef __ASSEMBLY__ -#include <asm/ptrace-abi.h> #include <sysdep/ptrace.h> struct pt_regs { diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c index 174ee50..7a0b2d9 100644 --- a/arch/um/kernel/ptrace.c +++ b/arch/um/kernel/ptrace.c @@ -8,6 +8,7 @@ #include <linux/sched.h> #include <linux/tracehook.h> #include <asm/uaccess.h> +#include <asm/ptrace-abi.h> void user_enable_single_step(struct task_struct *child) { diff --git a/arch/x86/um/ptrace_32.c b/arch/x86/um/ptrace_32.c index ce3dd4f..a29756f 100644 --- a/arch/x86/um/ptrace_32.c +++ b/arch/x86/um/ptrace_32.c @@ -6,6 +6,7 @@ #include <linux/mm.h> #include <linux/sched.h> #include <asm/uaccess.h> +#include <asm/ptrace-abi.h> #include <skas.h> extern int arch_switch_tls(struct task_struct *to); diff --git a/arch/x86/um/ptrace_64.c b/arch/x86/um/ptrace_64.c index 3b52bf0..a629694 100644 --- a/arch/x86/um/ptrace_64.c +++ b/arch/x86/um/ptrace_64.c @@ -11,6 +11,7 @@ #define __FRAME_OFFSETS #include <asm/ptrace.h> #include <asm/uaccess.h> +#include <asm/ptrace-abi.h> /* * determines which flags the user has access to. diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c index 80ffa5b..48e3858 100644 --- a/arch/x86/um/tls_32.c +++ b/arch/x86/um/tls_32.c @@ -7,6 +7,7 @@ #include <linux/sched.h> #include <linux/syscalls.h> #include <asm/uaccess.h> +#include <asm/ptrace-abi.h> #include <os.h> #include <skas.h> #include <sysdep/tls.h> diff --git a/arch/x86/um/tls_64.c b/arch/x86/um/tls_64.c index d22363c..3ad7143 100644 --- a/arch/x86/um/tls_64.c +++ b/arch/x86/um/tls_64.c @@ -1,4 +1,5 @@ #include <linux/sched.h> +#include <asm/ptrace-abi.h> void clear_flushed_tls(struct task_struct *task) {