Commit a9a17104 authored by Vivek Goyal's avatar Vivek Goyal Committed by H. Peter Anvin

x86, boot: Remove misc.h inclusion from compressed/string.c

Given the fact that we removed inclusion of boot.h from boot/string.c
does not look like we need misc.h inclusion in compressed/string.c. So
remove it.

misc.h was also pulling in string_32.h which in turn had macros for
memcmp and memcpy. So we don't need to #undef memcmp and memcpy anymore.
Signed-off-by: default avatarVivek Goyal <vgoyal@redhat.com>
Link: http://lkml.kernel.org/r/1398447972-27896-3-git-send-email-vgoyal@redhat.comSigned-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 3d379225
#include "misc.h"
#include "../string.c" #include "../string.c"
/* misc.h might pull in string_32.h which has a macro for memcpy. undef that */
#undef memcpy
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
void *memcpy(void *dest, const void *src, size_t n) void *memcpy(void *dest, const void *src, size_t n)
{ {
......
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
#include <linux/types.h> #include <linux/types.h>
#include "ctype.h" #include "ctype.h"
/*
* This file gets included in compressed/string.c which might pull in
* string_32.h and which in turn maps memcmp to __builtin_memcmp(). Undo
* that first.
*/
#undef memcmp
int memcmp(const void *s1, const void *s2, size_t len) int memcmp(const void *s1, const void *s2, size_t len)
{ {
u8 diff; u8 diff;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment