Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7a38766 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-boot-for-linus' of... 

Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next

Pull x86 boot changes from Ingo Molnar:
 "Two small cleanups"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, boot: Remove misc.h inclusion from compressed/string.c
  x86, boot: Do not include boot.h in string.c
parents 3d1a3bda a9a17104

arch/x86/boot/compressed/string.c

+0 −4
Original line number Diff line number Diff line 
#include "misc.h"

#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

void *memcpy(void *dest, const void *src, size_t n)

{

arch/x86/boot/string.c

+2 −7
Original line number Diff line number Diff line
@@ -12,14 +12,9 @@ 
 * Very basic string functions

 */



#include "boot.h"

#include <linux/types.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)

{

	u8 diff;