diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-09-04 18:22:54 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-09-04 18:22:54 +0200 |
| commit | a6cbfa1e6d38c4b3ab0ce7e3aea4bb4e744f24b8 (patch) | |
| tree | 8960e571a398b5d32e72bdb9c89ce965daa870ab /arch/arc | |
| parent | Input: xpad - fix PowerA init quirk for some gamepad models (diff) | |
| parent | Input: byd - make array seq static, reduces object code size (diff) | |
| download | linux-a6cbfa1e6d38c4b3ab0ce7e3aea4bb4e744f24b8.tar.xz linux-a6cbfa1e6d38c4b3ab0ce7e3aea4bb4e744f24b8.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 4.14 merge window.
Diffstat (limited to 'arch/arc')
| -rw-r--r-- | arch/arc/include/asm/processor.h | 2 | ||||
| -rw-r--r-- | arch/arc/mm/mmap.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arc/include/asm/processor.h b/arch/arc/include/asm/processor.h index 6e1242da0159..4104a0839214 100644 --- a/arch/arc/include/asm/processor.h +++ b/arch/arc/include/asm/processor.h @@ -86,8 +86,6 @@ struct task_struct; #define TSK_K_BLINK(tsk) TSK_K_REG(tsk, 4) #define TSK_K_FP(tsk) TSK_K_REG(tsk, 0) -#define thread_saved_pc(tsk) TSK_K_BLINK(tsk) - extern void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long usp); diff --git a/arch/arc/mm/mmap.c b/arch/arc/mm/mmap.c index 3e25e8d6486b..2e13683dfb24 100644 --- a/arch/arc/mm/mmap.c +++ b/arch/arc/mm/mmap.c @@ -65,7 +65,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, vma = find_vma(mm, addr); if (TASK_SIZE - len >= addr && - (!vma || addr + len <= vma->vm_start)) + (!vma || addr + len <= vm_start_gap(vma))) return addr; } |