diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-03 18:43:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-03 18:43:00 -0400 |
commit | 33ef765ea66f8464d6b65798b5aed3713420cced (patch) | |
tree | d256be5a60ac7b34923cff5ce918ebf39198904a | |
parent | e7a38766d2e691e8030b77c9b46b19c9359e0d6c (diff) | |
parent | a9358bc3531901a15e2f7cd48550c9555fc0288f (diff) |
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
Pull x86 build cleanups from Ingo Molnar:
"Two small build related cleanups"
* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/build: Supress realmode.bin is up to date message
compiler-intel.h: Remove duplicate definition
-rw-r--r-- | arch/x86/realmode/rm/Makefile | 3 | ||||
-rw-r--r-- | include/linux/compiler-intel.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile index 3497f14e4dea..7c0d7be176a5 100644 --- a/arch/x86/realmode/rm/Makefile +++ b/arch/x86/realmode/rm/Makefile | |||
@@ -52,8 +52,9 @@ $(obj)/realmode.elf: $(obj)/realmode.lds $(REALMODE_OBJS) FORCE | |||
52 | OBJCOPYFLAGS_realmode.bin := -O binary | 52 | OBJCOPYFLAGS_realmode.bin := -O binary |
53 | 53 | ||
54 | targets += realmode.bin | 54 | targets += realmode.bin |
55 | $(obj)/realmode.bin: $(obj)/realmode.elf $(obj)/realmode.relocs | 55 | $(obj)/realmode.bin: $(obj)/realmode.elf $(obj)/realmode.relocs FORCE |
56 | $(call if_changed,objcopy) | 56 | $(call if_changed,objcopy) |
57 | @: | ||
57 | 58 | ||
58 | quiet_cmd_relocs = RELOCS $@ | 59 | quiet_cmd_relocs = RELOCS $@ |
59 | cmd_relocs = arch/x86/tools/relocs --realmode $< > $@ | 60 | cmd_relocs = arch/x86/tools/relocs --realmode $< > $@ |
diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h index 5529c5239421..ba147a1727e6 100644 --- a/include/linux/compiler-intel.h +++ b/include/linux/compiler-intel.h | |||
@@ -13,12 +13,9 @@ | |||
13 | /* Intel ECC compiler doesn't support gcc specific asm stmts. | 13 | /* Intel ECC compiler doesn't support gcc specific asm stmts. |
14 | * It uses intrinsics to do the equivalent things. | 14 | * It uses intrinsics to do the equivalent things. |
15 | */ | 15 | */ |
16 | #undef barrier | ||
17 | #undef RELOC_HIDE | 16 | #undef RELOC_HIDE |
18 | #undef OPTIMIZER_HIDE_VAR | 17 | #undef OPTIMIZER_HIDE_VAR |
19 | 18 | ||
20 | #define barrier() __memory_barrier() | ||
21 | |||
22 | #define RELOC_HIDE(ptr, off) \ | 19 | #define RELOC_HIDE(ptr, off) \ |
23 | ({ unsigned long __ptr; \ | 20 | ({ unsigned long __ptr; \ |
24 | __ptr = (unsigned long) (ptr); \ | 21 | __ptr = (unsigned long) (ptr); \ |