diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-12 08:20:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-12 08:20:47 +0200 |
| commit | 7bf1e44f865523aa16e0eb340a82d643da9215b5 (patch) | |
| tree | 1ddb344169d39413053057d888edbb18dfeed880 /arch/arm/boot/compressed/efi-header.S | |
| parent | e5770b7bdbfe9f23bb75a7d5a88c1f5e18e20738 (diff) | |
| parent | 32c1431eea4881a6b17bd7c639315010aeefa452 (diff) | |
| download | talos-obmc-linux-7bf1e44f865523aa16e0eb340a82d643da9215b5.tar.gz talos-obmc-linux-7bf1e44f865523aa16e0eb340a82d643da9215b5.zip | |
Merge 4.12-rc5 into staging-next
We want the IIO fixes and other staging driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/compressed/efi-header.S')
| -rw-r--r-- | arch/arm/boot/compressed/efi-header.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/boot/compressed/efi-header.S b/arch/arm/boot/compressed/efi-header.S index 9d5dc4fda3c1..3f7d1b74c5e0 100644 --- a/arch/arm/boot/compressed/efi-header.S +++ b/arch/arm/boot/compressed/efi-header.S @@ -17,14 +17,12 @@ @ there. .inst 'M' | ('Z' << 8) | (0x1310 << 16) @ tstne r0, #0x4d000 #else - mov r0, r0 + W(mov) r0, r0 #endif .endm .macro __EFI_HEADER #ifdef CONFIG_EFI_STUB - b __efi_start - .set start_offset, __efi_start - start .org start + 0x3c @ |
