History

Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: ARM: 7128/1: vic: Don't write to the read-only register VIC_IRQ_STATUS ARM: 7122/1: localtimer: add header linux/errno.h explicitly ARM: 7117/1: perf: fix HW_CACHE_* events on Cortex-A9 ARM: 7113/1: mm: Align bank start to MAX_ORDER_NR_PAGES

Linus Torvalds committed 15 years ago

Commit 8bc03e82 parents 4c41042 f8be12d4 files · +11 −3Browse files

Unified · Split

4 files
  1. arch/arm/common/vic.c +0 −1
  2. arch/arm/include/asm/localtimer.h +2 −0
  3. arch/arm/kernel/perf_event_v7.c +2 −2
  4. arch/arm/mm/init.c +7 −0
arch/arm/common/vic.c+0−1
@@ -259,7 +259,6 @@ static void __init vic_disable(void __iomem *base) · 258 unmodified lines
259259 writel(0, base + VIC_INT_SELECT);
260260 writel(0, base + VIC_INT_ENABLE);
261261 writel(~0, base + VIC_INT_ENABLE_CLEAR);
262− writel(0, base + VIC_IRQ_STATUS);
263262 writel(0, base + VIC_ITCR);
264263 writel(~0, base + VIC_INT_SOFT_CLEAR);
265264 }
arch/arm/include/asm/localtimer.h+2−0
@@ -10,6 +10,8 @@ · 9 unmodified lines
1010 #ifndef __ASM_ARM_LOCALTIMER_H
1111 #define __ASM_ARM_LOCALTIMER_H
1212
13+#include <linux/errno.h>
14+
1315 struct clock_event_device;
1416
1517 /*
arch/arm/kernel/perf_event_v7.c+2−2
@@ -321,8 +321,8 @@ static const unsigned armv7_a9_perf_map[PERF_COUNT_HW_MAX] = { · 320 unmodified lines
321321 [PERF_COUNT_HW_CPU_CYCLES] = ARMV7_PERFCTR_CPU_CYCLES,
322322 [PERF_COUNT_HW_INSTRUCTIONS] =
323323 ARMV7_PERFCTR_INST_OUT_OF_RENAME_STAGE,
324− [PERF_COUNT_HW_CACHE_REFERENCES] = ARMV7_PERFCTR_COHERENT_LINE_HIT,
325− [PERF_COUNT_HW_CACHE_MISSES] = ARMV7_PERFCTR_COHERENT_LINE_MISS,
324+ [PERF_COUNT_HW_CACHE_REFERENCES] = ARMV7_PERFCTR_DCACHE_ACCESS,
325+ [PERF_COUNT_HW_CACHE_MISSES] = ARMV7_PERFCTR_DCACHE_REFILL,
326326 [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = ARMV7_PERFCTR_PC_WRITE,
327327 [PERF_COUNT_HW_BRANCH_MISSES] = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
328328 [PERF_COUNT_HW_BUS_CYCLES] = ARMV7_PERFCTR_CLOCK_CYCLES,
arch/arm/mm/init.c+7−0
@@ -496,6 +496,13 @@ static void __init free_unused_memmap(struct meminfo *mi) · 495 unmodified lines
496496 */
497497 bank_start = min(bank_start,
498498 ALIGN(prev_bank_end, PAGES_PER_SECTION));
499+#else
500+ /*
501+ * Align down here since the VM subsystem insists that the
502+ * memmap entries are valid from the bank start aligned to
503+ * MAX_ORDER_NR_PAGES.
504+ */
505+ bank_start = round_down(bank_start, MAX_ORDER_NR_PAGES);
499506 #endif
500507 /*
501508 * If we had a previous bank, and there is a space

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