xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2014-06-03 15:41:57 -07:00
parent 3d1a3bda65 a9a17104a1
commit e7a38766d2
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/boot/compressed/string.c
View File

@@ -1,9 +1,5 @@
#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)
{ {

9
arch/x86/boot/string.c
View File

@@ -12,14 +12,9 @@
* Very basic string functions * 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) int memcmp(const void *s1, const void *s2, size_t len)
{ {
u8 diff; u8 diff;