diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-14 09:45:22 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-14 09:55:00 -0700 |
| commit | 4dddf720534a9a14fa9b048e7930dcc55b1b1e40 (patch) | |
| tree | 6dead0bf02a9c08038d3238b1599823a25d9e881 /arch/x86/boot/compressed/head_32.S | |
| parent | a93bdb5f55d343fb51892050ed49da9d476da18a (diff) | |
| parent | 07818b5b1ba0f494a7255ab634bad2dd2b908ed0 (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-15.08-android
Conflicts:
fs/exec.c
Resolution summary:
Conflict between upstream/LTS commit 9eae8ac6ab40 (fs: take
i_mutex during prepare_binprm for set[ug]id executables) and
android commit 9d0ff694bc22 (sched: move no_new_privs into new
atomic flags). Resolution: move task_no_new_privs() usage into
new function created by upstream/LTS comit.
Diffstat (limited to 'arch/x86/boot/compressed/head_32.S')
| -rw-r--r-- | arch/x86/boot/compressed/head_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S index abb988a54c69..3b28eff9b90b 100644 --- a/arch/x86/boot/compressed/head_32.S +++ b/arch/x86/boot/compressed/head_32.S @@ -54,7 +54,7 @@ ENTRY(efi_pe_entry) call reloc reloc: popl %ecx - subl reloc, %ecx + subl $reloc, %ecx movl %ecx, BP_code32_start(%eax) sub $0x4, %esp |