diff options
| author | Chris Zankel <chris@zankel.net> | 2014-11-10 00:24:48 -0800 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-11-10 00:24:48 -0800 |
| commit | c0d7aa07504a8f4abd7b02b9144c4a92b7565f45 (patch) | |
| tree | a983f40010592c96e43def4f1293392bb3c99f2d /arch/xtensa/kernel | |
| parent | aeb589734251aaf4c28d80d0efb5da01dc0ce868 (diff) | |
| parent | 4006e565e1500db40b8546dcc6011737bc5d986c (diff) | |
Merge tag 'xtensa-for-next-20141021-2' of git://github.com/jcmvbkbc/linux-xtensa into for_next
Xtensa improvements for 3.18:
- fix nommu support;
- remove s6000 variant and s6105 platform.
Diffstat (limited to 'arch/xtensa/kernel')
| -rw-r--r-- | arch/xtensa/kernel/head.S | 5 | ||||
| -rw-r--r-- | arch/xtensa/kernel/syscall.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S index aeeb3cc8a410..15a461e2a0ed 100644 --- a/arch/xtensa/kernel/head.S +++ b/arch/xtensa/kernel/head.S @@ -112,6 +112,11 @@ ENTRY(_startup) movi a0, 0 +#if XCHAL_HAVE_VECBASE + movi a2, VECBASE_RESET_VADDR + wsr a2, vecbase +#endif + /* Clear debugging registers. */ #if XCHAL_HAVE_DEBUG diff --git a/arch/xtensa/kernel/syscall.c b/arch/xtensa/kernel/syscall.c index 5d3f7a119ed1..83cf49685373 100644 --- a/arch/xtensa/kernel/syscall.c +++ b/arch/xtensa/kernel/syscall.c @@ -57,6 +57,7 @@ asmlinkage long xtensa_fadvise64_64(int fd, int advice, return sys_fadvise64_64(fd, offset, len, advice); } +#ifdef CONFIG_MMU unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags) { @@ -93,3 +94,4 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, addr = COLOUR_ALIGN(addr, pgoff); } } +#endif |