* '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
Unified · Split
| @@ -259,7 +259,6 @@ static void __init vic_disable(void __iomem *base) · 258 unmodified lines | ||
| 259 | 259 | writel(0, base + VIC_INT_SELECT); |
| 260 | 260 | writel(0, base + VIC_INT_ENABLE); |
| 261 | 261 | writel(~0, base + VIC_INT_ENABLE_CLEAR); |
| 262 | − writel(0, base + VIC_IRQ_STATUS); | |
| 263 | 262 | writel(0, base + VIC_ITCR); |
| 264 | 263 | writel(~0, base + VIC_INT_SOFT_CLEAR); |
| 265 | 264 | } |
| @@ -10,6 +10,8 @@ · 9 unmodified lines | ||
| 10 | 10 | #ifndef __ASM_ARM_LOCALTIMER_H |
| 11 | 11 | #define __ASM_ARM_LOCALTIMER_H |
| 12 | 12 | |
| 13 | +#include <linux/errno.h> | |
| 14 | + | |
| 13 | 15 | struct clock_event_device; |
| 14 | 16 | |
| 15 | 17 | /* |
| @@ -321,8 +321,8 @@ static const unsigned armv7_a9_perf_map[PERF_COUNT_HW_MAX] = { · 320 unmodified lines | ||
| 321 | 321 | [PERF_COUNT_HW_CPU_CYCLES] = ARMV7_PERFCTR_CPU_CYCLES, |
| 322 | 322 | [PERF_COUNT_HW_INSTRUCTIONS] = |
| 323 | 323 | 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, | |
| 326 | 326 | [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = ARMV7_PERFCTR_PC_WRITE, |
| 327 | 327 | [PERF_COUNT_HW_BRANCH_MISSES] = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED, |
| 328 | 328 | [PERF_COUNT_HW_BUS_CYCLES] = ARMV7_PERFCTR_CLOCK_CYCLES, |
| @@ -496,6 +496,13 @@ static void __init free_unused_memmap(struct meminfo *mi) · 495 unmodified lines | ||
| 496 | 496 | */ |
| 497 | 497 | bank_start = min(bank_start, |
| 498 | 498 | 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); | |
| 499 | 506 | #endif |
| 500 | 507 | /* |
| 501 | 508 | * If we had a previous bank, and there is a space |