Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bc03e8f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4c41042d f8be12d1

arch/arm/common/vic.c

+0 −1
Original line number Diff line number Diff line
@@ -259,7 +259,6 @@ static void __init vic_disable(void __iomem *base) 
	writel(0, base + VIC_INT_SELECT);

	writel(0, base + VIC_INT_ENABLE);

	writel(~0, base + VIC_INT_ENABLE_CLEAR);

	writel(0, base + VIC_IRQ_STATUS);

	writel(0, base + VIC_ITCR);

	writel(~0, base + VIC_INT_SOFT_CLEAR);

}

arch/arm/include/asm/localtimer.h

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
#ifndef __ASM_ARM_LOCALTIMER_H

#define __ASM_ARM_LOCALTIMER_H



#include <linux/errno.h>



struct clock_event_device;



/*

arch/arm/kernel/perf_event_v7.c

+2 −2
Original line number Diff line number Diff line
@@ -321,8 +321,8 @@ static const unsigned armv7_a9_perf_map[PERF_COUNT_HW_MAX] = { 
	[PERF_COUNT_HW_CPU_CYCLES]	    = ARMV7_PERFCTR_CPU_CYCLES,

	[PERF_COUNT_HW_INSTRUCTIONS]	    =

					ARMV7_PERFCTR_INST_OUT_OF_RENAME_STAGE,

	[PERF_COUNT_HW_CACHE_REFERENCES]    = ARMV7_PERFCTR_COHERENT_LINE_HIT,

	[PERF_COUNT_HW_CACHE_MISSES]	    = ARMV7_PERFCTR_COHERENT_LINE_MISS,

	[PERF_COUNT_HW_CACHE_REFERENCES]    = ARMV7_PERFCTR_DCACHE_ACCESS,

	[PERF_COUNT_HW_CACHE_MISSES]	    = ARMV7_PERFCTR_DCACHE_REFILL,

	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = ARMV7_PERFCTR_PC_WRITE,

	[PERF_COUNT_HW_BRANCH_MISSES]	    = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,

	[PERF_COUNT_HW_BUS_CYCLES]	    = ARMV7_PERFCTR_CLOCK_CYCLES,

arch/arm/mm/init.c

+7 −0
Original line number Diff line number Diff line
@@ -496,6 +496,13 @@ static void __init free_unused_memmap(struct meminfo *mi) 
		 */

		bank_start = min(bank_start,

				 ALIGN(prev_bank_end, PAGES_PER_SECTION));

#else

		/*

		 * Align down here since the VM subsystem insists that the

		 * memmap entries are valid from the bank start aligned to

		 * MAX_ORDER_NR_PAGES.

		 */

		bank_start = round_down(bank_start, MAX_ORDER_NR_PAGES);

#endif

		/*

		 * If we had a previous bank, and there is a space