Pull ARM fixes from Russell King: "A number of smallish fixes scattered around the ARM code. Probably the most serious one is the one from Al addressing the missing locking in the swap emulation code." * 'fixes' of git://git.linaro.org/people/rmk/linux-arm: ARM: 7607/1: realview: fix private peripheral memory base for EB rev. B boards ARM: 7606/1: cache: flush to LoUU instead of LoUIS on uniprocessor CPUs ARM: missing ->mmap_sem around find_vma() in swp_emulate.c ARM: 7605/1: vmlinux.lds: Move .notes section next to the rodata ARM: 7602/1: Pass real "__machine_arch_type" variable to setup_machine_tags() procedure ARM: 7600/1: include CONFIG_DEBUG_LL_INCLUDE rather than mach/debug-macro.S
Unified · Split
| @@ -44,7 +44,7 @@ · 43 unmodified lines | |||
| 44 | 44 | ||
| 45 | #else | 45 | #else |
| 46 | 46 | ||
| 47 | #include <mach/debug-macro.S> | 47 | #include CONFIG_DEBUG_LL_INCLUDE |
| 48 | 48 | ||
| 49 | .macro writeb, ch, rb | 49 | .macro writeb, ch, rb |
| 50 | senduart \ch, \rb | 50 | senduart \ch, \rb |
| @@ -733,7 +733,7 @@ void __init setup_arch(char **cmdline_p) · 732 unmodified lines | |||
| 733 | setup_processor(); | 733 | setup_processor(); |
| 734 | mdesc = setup_machine_fdt(__atags_pointer); | 734 | mdesc = setup_machine_fdt(__atags_pointer); |
| 735 | if (!mdesc) | 735 | if (!mdesc) |
| 736 | mdesc = setup_machine_tags(__atags_pointer, machine_arch_type); | 736 | mdesc = setup_machine_tags(__atags_pointer, __machine_arch_type); |
| 737 | machine_desc = mdesc; | 737 | machine_desc = mdesc; |
| 738 | machine_name = mdesc->name; | 738 | machine_name = mdesc->name; |
| 739 | 739 | ||
| @@ -109,10 +109,12 @@ static void set_segfault(struct pt_regs *regs, unsigned long addr) · 108 unmodified lines | |||
| 109 | { | 109 | { |
| 110 | siginfo_t info; | 110 | siginfo_t info; |
| 111 | 111 | ||
| 112 | down_read(¤t->mm->mmap_sem); | ||
| 112 | if (find_vma(current->mm, addr) == NULL) | 113 | if (find_vma(current->mm, addr) == NULL) |
| 113 | info.si_code = SEGV_MAPERR; | 114 | info.si_code = SEGV_MAPERR; |
| 114 | else | 115 | else |
| 115 | info.si_code = SEGV_ACCERR; | 116 | info.si_code = SEGV_ACCERR; |
| 117 | up_read(¤t->mm->mmap_sem); | ||
| 116 | 118 | ||
| 117 | info.si_signo = SIGSEGV; | 119 | info.si_signo = SIGSEGV; |
| 118 | info.si_errno = 0; | 120 | info.si_errno = 0; |
| @@ -140,6 +140,8 @@ SECTIONS · 139 unmodified lines | |||
| 140 | } | 140 | } |
| 141 | #endif | 141 | #endif |
| 142 | 142 | ||
| 143 | NOTES | ||
| 144 | |||
| 143 | _etext = .; /* End of text and rodata section */ | 145 | _etext = .; /* End of text and rodata section */ |
| 144 | 146 | ||
| 145 | #ifndef CONFIG_XIP_KERNEL | 147 | #ifndef CONFIG_XIP_KERNEL |
| @@ -295,8 +297,6 @@ SECTIONS · 149 unmodified lines | |||
| 295 | } | 297 | } |
| 296 | #endif | 298 | #endif |
| 297 | 299 | ||
| 298 | NOTES | ||
| 299 | |||
| 300 | BSS_SECTION(0, 0, 0) | 300 | BSS_SECTION(0, 0, 0) |
| 301 | _end = .; | 301 | _end = .; |
| 302 | 302 | ||
| @@ -47,7 +47,7 @@ · 46 unmodified lines | |||
| 47 | #define REALVIEW_EB_USB_BASE 0x4F000000 /* USB */ | 47 | #define REALVIEW_EB_USB_BASE 0x4F000000 /* USB */ |
| 48 | 48 | ||
| 49 | #ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB | 49 | #ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB |
| 50 | #define REALVIEW_EB11MP_PRIV_MEM_BASE 0x1F000000 | 50 | #define REALVIEW_EB11MP_PRIV_MEM_BASE 0x10100000 |
| 51 | #define REALVIEW_EB11MP_L220_BASE 0x10102000 /* L220 registers */ | 51 | #define REALVIEW_EB11MP_L220_BASE 0x10102000 /* L220 registers */ |
| 52 | #define REALVIEW_EB11MP_SYS_PLD_CTRL1 0xD8 /* Register offset for MPCore sysctl */ | 52 | #define REALVIEW_EB11MP_SYS_PLD_CTRL1 0xD8 /* Register offset for MPCore sysctl */ |
| 53 | #else | 53 | #else |
| @@ -44,8 +44,10 @@ ENDPROC(v7_flush_icache_all) · 43 unmodified lines | |||
| 44 | ENTRY(v7_flush_dcache_louis) | 44 | ENTRY(v7_flush_dcache_louis) |
| 45 | dmb @ ensure ordering with previous memory accesses | 45 | dmb @ ensure ordering with previous memory accesses |
| 46 | mrc p15, 1, r0, c0, c0, 1 @ read clidr, r0 = clidr | 46 | mrc p15, 1, r0, c0, c0, 1 @ read clidr, r0 = clidr |
| 47 | ands r3, r0, #0xe00000 @ extract LoUIS from clidr | 47 | ALT_SMP(ands r3, r0, #(7 << 21)) @ extract LoUIS from clidr |
| 48 | mov r3, r3, lsr #20 @ r3 = LoUIS * 2 | 48 | ALT_UP(ands r3, r0, #(7 << 27)) @ extract LoUU from clidr |
| 49 | ALT_SMP(mov r3, r3, lsr #20) @ r3 = LoUIS * 2 | ||
| 50 | ALT_UP(mov r3, r3, lsr #26) @ r3 = LoUU * 2 | ||
| 49 | moveq pc, lr @ return if level == 0 | 51 | moveq pc, lr @ return if level == 0 |
| 50 | mov r10, #0 @ r10 (starting level) = 0 | 52 | mov r10, #0 @ r10 (starting level) = 0 |
| 51 | b flush_levels @ start flushing cache levels | 53 | b flush_levels @ start flushing cache levels |