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

Commit 529e5fbc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull late ARM updates from Russell King:
 "Here is the late set of ARM updates for this merge window; in here is:

   - The ARM parts of the broadcast timer support, core parts merged
     through tglx's tree.  This was left over from the previous merge to
     allow the dependency on tglx's tree to be resolved.

   - A fix to the VFP code which shows up on Raspberry Pi's, as well as
     fixing the fallout from a previous commit in this area.

   - A number of smaller fixes scattered throughout the ARM tree"

* 'for-linus' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: Fix broken commit 0cc41e4a corrupting kernel messages
  ARM: fix scheduling while atomic warning in alignment handling code
  ARM: VFP: fix emulation of second VFP instruction
  ARM: 7656/1: uImage: Error out on build of multiplatform without LOADADDR
  ARM: 7640/1: memory: tegra_ahb_enable_smmu() depends on TEGRA_IOMMU_SMMU
  ARM: 7654/1: Preserve L_PTE_VALID in pte_modify()
  ARM: 7653/2: do not scale loops_per_jiffy when using a constant delay clock
  ARM: 7651/1: remove unused smp_timer_broadcast #define
parents 686c0940 16af43fe

arch/arm/boot/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ else 
endif



check_for_multiple_loadaddr = \

if [ $(words $(UIMAGE_LOADADDR)) -gt 1 ]; then \

	echo 'multiple load addresses: $(UIMAGE_LOADADDR)'; \

if [ $(words $(UIMAGE_LOADADDR)) -ne 1 ]; then \

	echo 'multiple (or no) load addresses: $(UIMAGE_LOADADDR)'; \

	echo 'This is incompatible with uImages'; \

	echo 'Specify LOADADDR on the commandline to build an uImage'; \

	false; \

arch/arm/include/asm/delay.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ extern struct arm_delay_ops { 
	void (*delay)(unsigned long);

	void (*const_udelay)(unsigned long);

	void (*udelay)(unsigned long);

	bool const_clock;

} arm_delay_ops;



#define __delay(n)		arm_delay_ops.delay(n)

arch/arm/include/asm/pgtable.h

+2 −1
Original line number Diff line number Diff line
@@ -247,7 +247,8 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; } 


static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)

{

	const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER | L_PTE_NONE;

	const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |

		L_PTE_NONE | L_PTE_VALID;

	pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);

	return pte;

}

arch/arm/kernel/smp.c

+3 −2
Original line number Diff line number Diff line
@@ -466,8 +466,6 @@ void tick_broadcast(const struct cpumask *mask) 
{

	smp_cross_call(mask, IPI_TIMER);

}

#else

#define smp_timer_broadcast	NULL

#endif



static void broadcast_timer_set_mode(enum clock_event_mode mode,
@@ -674,6 +672,9 @@ static int cpufreq_callback(struct notifier_block *nb, 
	if (freq->flags & CPUFREQ_CONST_LOOPS)

		return NOTIFY_OK;



	if (arm_delay_ops.const_clock)

		return NOTIFY_OK;



	if (!per_cpu(l_p_j_ref, cpu)) {

		per_cpu(l_p_j_ref, cpu) =

			per_cpu(cpu_data, cpu).loops_per_jiffy;

arch/arm/lib/delay.c

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ void __init register_current_timer_delay(const struct delay_timer *timer) 
		arm_delay_ops.delay		= __timer_delay;

		arm_delay_ops.const_udelay	= __timer_const_udelay;

		arm_delay_ops.udelay		= __timer_udelay;

		arm_delay_ops.const_clock	= true;

		delay_calibrated		= true;

	} else {

		pr_info("Ignoring duplicate/late registration of read_current_timer delay\n");