The following upcoming upstream commit: 92b0729c34ca ("x86/mm, x86/mce: Add memcpy_mcsafe()") Adds _ASM_EXTABLE_FAULT(), which is not available in user-space and breaks the build. We don't really need _ASM_EXTABLE_FAULT() in user-space, so simply wrap it to nothing. Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: David Ahern <dsahern@gmail.com> Cc: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
16 lines
520 B
ArmAsm
16 lines
520 B
ArmAsm
|
|
/* Various wrappers to make the kernel .S file build in user-space: */
|
|
|
|
#define memcpy MEMCPY /* don't hide glibc's memcpy() */
|
|
#define altinstr_replacement text
|
|
#define globl p2align 4; .globl
|
|
#define _ASM_EXTABLE_FAULT(x, y)
|
|
|
|
#include "../../../arch/x86/lib/memcpy_64.S"
|
|
/*
|
|
* We need to provide note.GNU-stack section, saying that we want
|
|
* NOT executable stack. Otherwise the final linking will assume that
|
|
* the ELF stack should not be restricted at all and set it RWX.
|
|
*/
|
|
.section .note.GNU-stack,"",@progbits
|