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

Commit 34d4ade7 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:
  davinci: cpufreq: fix section mismatch warning
  DaVinci: fix compilation warnings in <mach/clkdev.h>
  davinci: tnetv107x: fix register indexing for GPIOs numbers > 31
  davinci: da8xx/omap-l1x: add platform device for davinci-pcm-audio
  ARM: pxa/tosa: register wm9712 codec device
  ARM: pxa: enable pxa-pcm-audio on pxa210/pxa25x platform
  ARM: pxa/colibri: don't register pxa2xx-pcmcia nodes on non-colibri platforms
  ARM: pxa/tosa: drop setting LED trigger name, as it's unsupported now
  ARM: 6762/1: Update number of VIC for S5P6442 and S5PC100
  ARM: 6761/1: Update number of VIC for S5PV210
  ARM: 6768/1: hw_breakpoint: ensure debug logic is powered up on v7 cores
  ARM: 6767/1: ptrace: fix register indexing in GETHBPREGS request
  ARM: 6765/1: remove obsolete comment from asm/mach/arch.h
  ARM: 6757/1: fix tlb.h induced linux/swap.h build failure
parents 1a345303 c0d61a79

arch/arm/common/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ config ARM_VIC 


config ARM_VIC_NR

	int

	default 4 if ARCH_S5PV210

	default 3 if ARCH_S5P6442 || ARCH_S5PC100

	default 2

	depends on ARM_VIC

	help

arch/arm/include/asm/mach/arch.h

+0 −4
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ struct meminfo; 
struct sys_timer;



struct machine_desc {

	/*

	 * Note! The first two elements are used

	 * by assembler code in head.S, head-common.S

	 */

	unsigned int		nr;		/* architecture number	*/

	const char		*name;		/* architecture name	*/

	unsigned long		boot_params;	/* tagged list		*/

arch/arm/include/asm/pgalloc.h

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

#define _ASMARM_PGALLOC_H



#include <linux/pagemap.h>



#include <asm/domain.h>

#include <asm/pgtable-hwdef.h>

#include <asm/processor.h>

arch/arm/kernel/hw_breakpoint.c

+23 −3
Original line number Diff line number Diff line
@@ -836,9 +836,11 @@ static int hw_breakpoint_pending(unsigned long addr, unsigned int fsr, 
/*

 * One-time initialisation.

 */

static void reset_ctrl_regs(void *unused)

static void reset_ctrl_regs(void *info)

{

	int i;

	int i, cpu = smp_processor_id();

	u32 dbg_power;

	cpumask_t *cpumask = info;



	/*

	 * v7 debug contains save and restore registers so that debug state
@@ -849,6 +851,17 @@ static void reset_ctrl_regs(void *unused) 
	 * later on.

	 */

	if (debug_arch >= ARM_DEBUG_ARCH_V7_ECP14) {

		/*

		 * Ensure sticky power-down is clear (i.e. debug logic is

		 * powered up).

		 */

		asm volatile("mrc p14, 0, %0, c1, c5, 4" : "=r" (dbg_power));

		if ((dbg_power & 0x1) == 0) {

			pr_warning("CPU %d debug is powered down!\n", cpu);

			cpumask_or(cpumask, cpumask, cpumask_of(cpu));

			return;

		}



		/*

		 * Unconditionally clear the lock by writing a value

		 * other than 0xC5ACCE55 to the access register.
@@ -887,6 +900,7 @@ static struct notifier_block __cpuinitdata dbg_reset_nb = { 
static int __init arch_hw_breakpoint_init(void)

{

	u32 dscr;

	cpumask_t cpumask = { CPU_BITS_NONE };



	debug_arch = get_debug_arch();
@@ -911,7 +925,13 @@ static int __init arch_hw_breakpoint_init(void) 
	 * Reset the breakpoint resources. We assume that a halting

	 * debugger will leave the world in a nice state for us.

	 */

	on_each_cpu(reset_ctrl_regs, NULL, 1);

	on_each_cpu(reset_ctrl_regs, &cpumask, 1);

	if (!cpumask_empty(&cpumask)) {

		core_num_brps = 0;

		core_num_reserved_brps = 0;

		core_num_wrps = 0;

		return 0;

	}



	ARM_DBG_READ(c1, 0, dscr);

	if (dscr & ARM_DSCR_HDBGEN) {

arch/arm/kernel/ptrace.c

+3 −3
Original line number Diff line number Diff line
@@ -996,10 +996,10 @@ static int ptrace_gethbpregs(struct task_struct *tsk, long num, 
		while (!(arch_ctrl.len & 0x1))

			arch_ctrl.len >>= 1;



		if (idx & 0x1)

			reg = encode_ctrl_reg(arch_ctrl);

		else

		if (num & 0x1)

			reg = bp->attr.bp_addr;

		else

			reg = encode_ctrl_reg(arch_ctrl);

	}



put: