From 992a88b62ca327f10d82dbad71a8c061d4229888 Mon Sep 17 00:00:00 2001 From: Hans-Christian Egtvedt Date: Thu, 9 Dec 2010 09:02:06 +0100 Subject: avr32: make architecture sys_clone prototype match asm-generic prototype This patch will fix the arguments to the architecture sys_clone() function to match the asm-generic/syscalls.h prototype. In the same go remove the architecture specific prototype for the same function. The sys_clone() function is only called from assembly, hence the argument types were not having any affect. Signed-off-by: Hans-Christian Egtvedt --- arch/avr32/kernel/process.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'arch/avr32/kernel') diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c index 9c46aaa..ef5a2a0 100644 --- a/arch/avr32/kernel/process.c +++ b/arch/avr32/kernel/process.c @@ -367,14 +367,13 @@ asmlinkage int sys_fork(struct pt_regs *regs) } asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, - unsigned long parent_tidptr, - unsigned long child_tidptr, struct pt_regs *regs) + void __user *parent_tidptr, void __user *child_tidptr, + struct pt_regs *regs) { if (!newsp) newsp = regs->sp; - return do_fork(clone_flags, newsp, regs, 0, - (int __user *)parent_tidptr, - (int __user *)child_tidptr); + return do_fork(clone_flags, newsp, regs, 0, parent_tidptr, + child_tidptr); } asmlinkage int sys_vfork(struct pt_regs *regs) -- cgit v1.1 From 1e2de47cddc70ae973cf468e2f2954b4ae80f4e3 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Mon, 1 Nov 2010 13:12:27 -0700 Subject: avr32: Convert to clocksource_register_hz This converts the avr32 clocksource to use clocksource_register_hz. This is untested, so any assistance in testing would be appreciated! CC: Hans-Christian Egtvedt CC: Thomas Gleixner Signed-off-by: John Stultz --- arch/avr32/kernel/time.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'arch/avr32/kernel') diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c index 668ed28..05ad291 100644 --- a/arch/avr32/kernel/time.c +++ b/arch/avr32/kernel/time.c @@ -35,7 +35,6 @@ static struct clocksource counter = { .rating = 50, .read = read_cycle_count, .mask = CLOCKSOURCE_MASK(32), - .shift = 16, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -123,9 +122,7 @@ void __init time_init(void) /* figure rate for counter */ counter_hz = clk_get_rate(boot_cpu_data.clk); - counter.mult = clocksource_hz2mult(counter_hz, counter.shift); - - ret = clocksource_register(&counter); + ret = clocksource_register_hz(&counter, counter_hz); if (ret) pr_debug("timer: could not register clocksource: %d\n", ret); -- cgit v1.1