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

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

Pull ARM and clkdev fixes from Russell King:
 "Two patches for clkdev which resolve the long standing issue that the
  devm_* versions were dependent on clkdev, which they shouldn't have
  been.  Instead, they're dependent on HAVE_CLK instead, which implies
  that you're providing clk_get() and clk_put().

  A small fix to the ARM decompressor to ensure that the page tables are
  properly interpreted by the CPU, and reserve syscall 378 for kcmp (the
  checksyscalls.sh script is unfortunately currently broken so arch
  maintainers aren't getting notified of new syscalls...)

  Lastly, a larger fix for an issue between the common clk subsystem and
  smp_twd which causes warnings to be spat out."

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: reserve syscall 378 for kcmp
  ARM: 7535/1: Reprogram smp_twd based on new common clk framework notifiers
  ARM: 7537/1: clk: Fix release in devm_clk_put()
  ARM: 7532/1: decompressor: reset SCTLR.TRE for VMSA ARMv7 cores
  ARM: 7534/1: clk: Make the managed clk functions generically available
parents cead24c1 bf619fae

arch/arm/boot/compressed/head.S

+1 −0
Original line number Diff line number Diff line
@@ -653,6 +653,7 @@ __armv7_mmu_cache_on: 
		mcrne	p15, 0, r0, c8, c7, 0	@ flush I,D TLBs

#endif

		mrc	p15, 0, r0, c1, c0, 0	@ read control reg

		bic	r0, r0, #1 << 28	@ clear SCTLR.TRE

		orr	r0, r0, #0x5000		@ I-cache enable, RR cache replacement

		orr	r0, r0, #0x003c		@ write buffer

#ifdef CONFIG_MMU

arch/arm/include/asm/unistd.h

+2 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ 
#define __NR_setns			(__NR_SYSCALL_BASE+375)

#define __NR_process_vm_readv		(__NR_SYSCALL_BASE+376)

#define __NR_process_vm_writev		(__NR_SYSCALL_BASE+377)

					/* 378 for kcmp */



/*

 * The following SWIs are ARM private.
@@ -483,6 +484,7 @@ 
 */

#define __IGNORE_fadvise64_64

#define __IGNORE_migrate_pages

#define __IGNORE_kcmp



#endif /* __KERNEL__ */

#endif /* __ASM_ARM_UNISTD_H */

arch/arm/kernel/calls.S

+1 −0
Original line number Diff line number Diff line
@@ -387,6 +387,7 @@ 
/* 375 */	CALL(sys_setns)

		CALL(sys_process_vm_readv)

		CALL(sys_process_vm_writev)

		CALL(sys_ni_syscall)	/* reserved for sys_kcmp */

#ifndef syscalls_counted

.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls

#define syscalls_counted

arch/arm/kernel/smp_twd.c

+46 −2
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/clk.h>

#include <linux/cpufreq.h>

#include <linux/delay.h>

#include <linux/device.h>

#include <linux/err.h>
@@ -96,7 +95,52 @@ static void twd_timer_stop(struct clock_event_device *clk) 
	disable_percpu_irq(clk->irq);

}



#ifdef CONFIG_CPU_FREQ

#ifdef CONFIG_COMMON_CLK



/*

 * Updates clockevent frequency when the cpu frequency changes.

 * Called on the cpu that is changing frequency with interrupts disabled.

 */

static void twd_update_frequency(void *new_rate)

{

	twd_timer_rate = *((unsigned long *) new_rate);



	clockevents_update_freq(*__this_cpu_ptr(twd_evt), twd_timer_rate);

}



static int twd_rate_change(struct notifier_block *nb,

	unsigned long flags, void *data)

{

	struct clk_notifier_data *cnd = data;



	/*

	 * The twd clock events must be reprogrammed to account for the new

	 * frequency.  The timer is local to a cpu, so cross-call to the

	 * changing cpu.

	 */

	if (flags == POST_RATE_CHANGE)

		smp_call_function(twd_update_frequency,

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



	return NOTIFY_OK;

}



static struct notifier_block twd_clk_nb = {

	.notifier_call = twd_rate_change,

};



static int twd_clk_init(void)

{

	if (twd_evt && *__this_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))

		return clk_notifier_register(twd_clk, &twd_clk_nb);



	return 0;

}

core_initcall(twd_clk_init);



#elif defined (CONFIG_CPU_FREQ)



#include <linux/cpufreq.h>



/*

 * Updates clockevent frequency when the cpu frequency changes.

arch/m68k/platform/coldfire/clk.c

+0 −6
Original line number Diff line number Diff line
@@ -146,9 +146,3 @@ struct clk_ops clk_ops1 = { 
};

#endif /* MCFPM_PPMCR1 */

#endif /* MCFPM_PPMCR0 */
 


struct clk *devm_clk_get(struct device *dev, const char *id)

{

	return NULL;

}

EXPORT_SYMBOL(devm_clk_get);

CRA Git | Maintained and supported by SUSTech CRA and CCSE