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

Commit 9826dbb1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:
 "Another few fixes for ARM, nothing major here"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 7938/1: OMAP4/highbank: Flush L2 cache before disabling
  ARM: 7939/1: traps: fix opcode endianness when read from user memory
  ARM: 7937/1: perf_event: Silence sparse warning
  ARM: 7934/1: DT/kernel: fix arch_match_cpu_phys_id to avoid erroneous match
  Revert "ARM: 7908/1: mm: Fix the arm_dma_limit calculation"
parents 70b23ce3 b25f3e1c

arch/arm/kernel/devtree.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ void __init arm_dt_init_cpu_maps(void) 


bool arch_match_cpu_phys_id(int cpu, u64 phys_id)

{

	return (phys_id & MPIDR_HWID_BITMASK) == cpu_logical_map(cpu);

	return phys_id == cpu_logical_map(cpu);

}



static const void * __init arch_get_next_mach(const char *const **match)

arch/arm/kernel/perf_event_cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static int probe_current_pmu(struct arm_pmu *pmu) 
static int cpu_pmu_device_probe(struct platform_device *pdev)

{

	const struct of_device_id *of_id;

	int (*init_fn)(struct arm_pmu *);

	const int (*init_fn)(struct arm_pmu *);

	struct device_node *node = pdev->dev.of_node;

	struct arm_pmu *pmu;

	int ret = -ENODEV;

arch/arm/kernel/traps.c

+3 −2
Original line number Diff line number Diff line
@@ -431,9 +431,10 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs) 
			instr2 = __mem_to_opcode_thumb16(instr2);

			instr = __opcode_thumb32_compose(instr, instr2);

		}

	} else if (get_user(instr, (u32 __user *)pc)) {

		instr = __mem_to_opcode_arm(instr);

	} else {

		if (get_user(instr, (u32 __user *)pc))

			goto die_sig;

		instr = __mem_to_opcode_arm(instr);

	}



	if (call_undef_hook(regs, instr) == 0)

arch/arm/mach-highbank/highbank.c

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static void __init highbank_scu_map_io(void) 


static void highbank_l2x0_disable(void)

{

	outer_flush_all();

	/* Disable PL310 L2 Cache controller */

	highbank_smc1(0x102, 0x0);

}

arch/arm/mach-omap2/omap4-common.c

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ void __iomem *omap4_get_l2cache_base(void) 


static void omap4_l2x0_disable(void)

{

	outer_flush_all();

	/* Disable PL310 L2 Cache controller */

	omap_smc1(0x102, 0x0);

}