History

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

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

Linus Torvalds committed 13 years ago

Commit f59dc2b2 parents f3dc129 e6ee4b26 files · +11 −7Browse files

Unified · Split

6 files
  1. arch/arm/boot/compressed/head.S +1 −1
  2. arch/arm/kernel/setup.c +1 −1
  3. arch/arm/kernel/swp_emulate.c +2 −0
  4. arch/arm/kernel/vmlinux.lds.S +2 −2
  5. arch/arm/mach-realview/include/mach/board-eb.h +1 −1
  6. arch/arm/mm/cache-v7.S +4 −2
arch/arm/boot/compressed/head.S+1−1
@@ -44,7 +44,7 @@ · 43 unmodified lines
4444
4545 #else
4646
47−#include <mach/debug-macro.S>
47+#include CONFIG_DEBUG_LL_INCLUDE
4848
4949 .macro writeb, ch, rb
5050 senduart \ch, \rb
arch/arm/kernel/setup.c+1−1
@@ -733,7 +733,7 @@ void __init setup_arch(char **cmdline_p) · 732 unmodified lines
733733 setup_processor();
734734 mdesc = setup_machine_fdt(__atags_pointer);
735735 if (!mdesc)
736− mdesc = setup_machine_tags(__atags_pointer, machine_arch_type);
736+ mdesc = setup_machine_tags(__atags_pointer, __machine_arch_type);
737737 machine_desc = mdesc;
738738 machine_name = mdesc->name;
739739
arch/arm/kernel/swp_emulate.c+2−0
@@ -109,10 +109,12 @@ static void set_segfault(struct pt_regs *regs, unsigned long addr) · 108 unmodified lines
109109 {
110110 siginfo_t info;
111111
112+ down_read(&current->mm->mmap_sem);
112113 if (find_vma(current->mm, addr) == NULL)
113114 info.si_code = SEGV_MAPERR;
114115 else
115116 info.si_code = SEGV_ACCERR;
117+ up_read(&current->mm->mmap_sem);
116118
117119 info.si_signo = SIGSEGV;
118120 info.si_errno = 0;
arch/arm/kernel/vmlinux.lds.S+2−2
@@ -140,6 +140,8 @@ SECTIONS · 139 unmodified lines
140140 }
141141 #endif
142142
143+ NOTES
144+
143145 _etext = .; /* End of text and rodata section */
144146
145147 #ifndef CONFIG_XIP_KERNEL
@@ -295,8 +297,6 @@ SECTIONS · 149 unmodified lines
295297 }
296298 #endif
297299
298− NOTES
299−
300300 BSS_SECTION(0, 0, 0)
301301 _end = .;
302302
arch/arm/mach-realview/include/mach/board-eb.h+1−1
@@ -47,7 +47,7 @@ · 46 unmodified lines
4747 #define REALVIEW_EB_USB_BASE 0x4F000000 /* USB */
4848
4949 #ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB
50−#define REALVIEW_EB11MP_PRIV_MEM_BASE 0x1F000000
50+#define REALVIEW_EB11MP_PRIV_MEM_BASE 0x10100000
5151 #define REALVIEW_EB11MP_L220_BASE 0x10102000 /* L220 registers */
5252 #define REALVIEW_EB11MP_SYS_PLD_CTRL1 0xD8 /* Register offset for MPCore sysctl */
5353 #else
arch/arm/mm/cache-v7.S+4−2
@@ -44,8 +44,10 @@ ENDPROC(v7_flush_icache_all) · 43 unmodified lines
4444 ENTRY(v7_flush_dcache_louis)
4545 dmb @ ensure ordering with previous memory accesses
4646 mrc p15, 1, r0, c0, c0, 1 @ read clidr, r0 = clidr
47− ands r3, r0, #0xe00000 @ extract LoUIS from clidr
48− mov r3, r3, lsr #20 @ r3 = LoUIS * 2
47+ ALT_SMP(ands r3, r0, #(7 << 21)) @ extract LoUIS from clidr
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
4951 moveq pc, lr @ return if level == 0
5052 mov r10, #0 @ r10 (starting level) = 0
5153 b flush_levels @ start flushing cache levels

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t