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

Commit bfd65dd9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 

Pull ARM fixes from Russell King:
 "A few fixes for ARM, mostly just one liners with the exception of the
  missing section specification.  We decided not to rely on .previous to
  fix this but to explicitly state the section we want the code to be
  in."

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: 7778/1: smp_twd: twd_update_frequency need be run on all online CPUs
  ARM: 7782/1: Kconfig: Let ARM_ERRATA_364296 not depend on CONFIG_SMP
  ARM: mm: fix boot on SA1110 Assabet
  ARM: 7781/1: mmu: Add debug_ll_io_init() mappings to early mappings
  ARM: 7780/1: add missing linker section markup to head-common.S
parents d1447464 cbbe6f82

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1316,7 +1316,7 @@ config ARM_ERRATA_754327 


config ARM_ERRATA_364296

	bool "ARM errata: Possible cache data corruption with hit-under-miss enabled"

	depends on CPU_V6 && !SMP

	depends on CPU_V6

	help

	  This options enables the workaround for the 364296 ARM1136

	  r0p2 erratum (possible cache data corruption with

arch/arm/kernel/head-common.S

+3 −0
Original line number Diff line number Diff line
@@ -133,6 +133,9 @@ ENTRY(lookup_processor_type) 
	ldmfd	sp!, {r4 - r6, r9, pc}

ENDPROC(lookup_processor_type)



	__FINIT

	.text



/*

 * Read processor ID register (CP#15, CR0), and look up in the linker-built

 * supported processor list.  Note that we can't use the absolute addresses

arch/arm/kernel/smp_twd.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static int twd_rate_change(struct notifier_block *nb, 
	 * changing cpu.

	 */

	if (flags == POST_RATE_CHANGE)

		smp_call_function(twd_update_frequency,

		on_each_cpu(twd_update_frequency,

				  (void *)&cnd->new_rate, 1);



	return NOTIFY_OK;

arch/arm/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ void __init mem_init(void) 


#ifdef CONFIG_SA1111

	/* now that our DMA memory is actually so designated, we can free it */

	free_reserved_area(__va(PHYS_PFN_OFFSET), swapper_pg_dir, -1, NULL);

	free_reserved_area(__va(PHYS_OFFSET), swapper_pg_dir, -1, NULL);

#endif



	free_highpages();

arch/arm/mm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -950,7 +950,7 @@ void __init debug_ll_io_init(void) 
	map.virtual &= PAGE_MASK;

	map.length = PAGE_SIZE;

	map.type = MT_DEVICE;

	create_mapping(&map);

	iotable_init(&map, 1);

}

#endif