This hunk shoud have been in the following patch: 796752003a42b70d1f32eb5771885f59febada0d Author: Andrey Ryabinin <aryabi...@odin.com> Date: Thu Sep 3 19:27:42 2015 +0400
ms/x86_64: kasan: add interceptors for memset/memmove/memcpy functions This fixes: In file included from ./arch/x86/include/asm/string.h:4:0, from include/linux/string.h:18, from include/linux/efi.h:15, from arch/x86/boot/compressed/eboot.c:12: ./arch/x86/include/asm/string_64.h:79:0: warning: "memset" redefined #define memset(s, c, n) __memset(s, c, n) In file included from arch/x86/boot/compressed/eboot.c:11:0: arch/x86/boot/compressed/../string.h:18:0: note: this is the location of the previous definition #define memset(d,c,l) __builtin_memset(d,c,l) Signed-off-by: Andrey Ryabinin <aryabi...@virtuozzo.com> --- arch/x86/boot/compressed/eboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index ec76e778d101..b4a6e12a2800 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -8,7 +8,6 @@ * ----------------------------------------------------------------------- */ #include <linux/types.h> -#include "../string.h" #include <linux/efi.h> #include <linux/pci.h> #include <asm/efi.h> @@ -16,6 +15,7 @@ #include <asm/desc.h> #include <asm/bootparam_utils.h> +#include "../string.h" #include "eboot.h" static efi_system_table_t *sys_table; -- 2.13.5 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel