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

Commit 33ef765e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents e7a38766 a9358bc3

arch/x86/realmode/rm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -52,8 +52,9 @@ $(obj)/realmode.elf: $(obj)/realmode.lds $(REALMODE_OBJS) FORCE 
OBJCOPYFLAGS_realmode.bin := -O binary



targets += realmode.bin

$(obj)/realmode.bin: $(obj)/realmode.elf $(obj)/realmode.relocs

$(obj)/realmode.bin: $(obj)/realmode.elf $(obj)/realmode.relocs FORCE

	$(call if_changed,objcopy)

	@:



quiet_cmd_relocs = RELOCS  $@

      cmd_relocs = arch/x86/tools/relocs --realmode $< > $@

include/linux/compiler-intel.h

+0 −3
Original line number Diff line number Diff line
@@ -13,12 +13,9 @@ 
/* Intel ECC compiler doesn't support gcc specific asm stmts.

 * It uses intrinsics to do the equivalent things.

 */

#undef barrier

#undef RELOC_HIDE

#undef OPTIMIZER_HIDE_VAR



#define barrier() __memory_barrier()



#define RELOC_HIDE(ptr, off)					\

  ({ unsigned long __ptr;					\

     __ptr = (unsigned long) (ptr);				\