diff options
| -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); \ |
