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

Commit 7fc76936 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6994/1: smp_twd: Fix typo in 'twd_timer_rate' printing
  ARM: 6987/1: l2x0: fix disabling function to avoid deadlock
  ARM: 6966/1: ep93xx: fix inverted RTS/DTR signals on uart1
  ARM: 6980/1: mmci: use StartBitErr to detect bad connections
  ARM: 6979/1: mach-vt8500: add forgotten irq_data conversion
  ARM: move memory layout sanity checking before meminfo initialization
  ARM: 6990/1: MAINTAINERS: add entry for ARM PMU profiling and debugging
  ARM: 6989/1: perf: do not start the PMU when no events are present
  ARM: dmabounce: fix map_single() error return value
parents 8733449b 90c5ffe5

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -594,6 +594,16 @@ S: Maintained 
F:	arch/arm/lib/floppydma.S

F:	arch/arm/include/asm/floppy.h



ARM PMU PROFILING AND DEBUGGING

M:	Will Deacon <will.deacon@arm.com>

S:	Maintained

F:	arch/arm/kernel/perf_event*

F:	arch/arm/oprofile/common.c

F:	arch/arm/kernel/pmu.c

F:	arch/arm/include/asm/pmu.h

F:	arch/arm/kernel/hw_breakpoint.c

F:	arch/arm/include/asm/hw_breakpoint.h



ARM PORT

M:	Russell King <linux@arm.linux.org.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/common/dmabounce.c

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static inline dma_addr_t map_single(struct device *dev, void *ptr, size_t size, 
		if (buf == 0) {

			dev_err(dev, "%s: unable to map unsafe buffer %p!\n",

			       __func__, ptr);

			return 0;

			return ~0;

		}



		dev_dbg(dev,

arch/arm/kernel/perf_event.c

+4 −2
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static int armpmu_event_init(struct perf_event *event) 
static void armpmu_enable(struct pmu *pmu)

{

	/* Enable all of the perf events on hardware. */

	int idx;

	int idx, enabled = 0;

	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);



	if (!armpmu)
@@ -596,8 +596,10 @@ static void armpmu_enable(struct pmu *pmu) 
			continue;



		armpmu->enable(&event->hw, idx);

		enabled = 1;

	}



	if (enabled)

		armpmu->start();

}

arch/arm/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ __setup("fpe=", fpe_setup); 
#endif



extern void paging_init(struct machine_desc *desc);

extern void sanity_check_meminfo(void);

extern void reboot_setup(char *str);



unsigned int processor_id;
@@ -900,6 +901,7 @@ void __init setup_arch(char **cmdline_p) 


	parse_early_param();



	sanity_check_meminfo();

	arm_memblock_init(&meminfo, mdesc);



	paging_init(mdesc);

arch/arm/kernel/smp_twd.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static void __cpuinit twd_calibrate_rate(void) 
		twd_timer_rate = (0xFFFFFFFFU - count) * (HZ / 5);



		printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000,

			(twd_timer_rate / 1000000) % 100);

			(twd_timer_rate / 10000) % 100);

	}

}