On Thu, 2006-08-03 at 20:24 -0700, [email protected] wrote:
> plain text document attachment (clocksource_cleanup.patch)
> Signed-Off-By: Daniel Walker <[email protected]>
Acked-by: John Stultz <[email protected]>
thanks
-john
> ---
> include/linux/clocksource.h | 2 +-
> kernel/time/clocksource.c | 6 +++---
> kernel/timer.c | 7 ++++---
> 3 files changed, 8 insertions(+), 7 deletions(-)
>
> Index: linux-2.6.17/include/linux/clocksource.h
> ===================================================================
> --- linux-2.6.17.orig/include/linux/clocksource.h
> +++ linux-2.6.17/include/linux/clocksource.h
> @@ -159,7 +159,7 @@ static inline s64 cyc2ns(struct clocksou
> * Unless you're the timekeeping code, you should not be using this!
> */
> static inline void clocksource_calculate_interval(struct clocksource *c,
> - unsigned long length_nsec)
> + unsigned long length_nsec)
> {
> u64 tmp;
>
> Index: linux-2.6.17/kernel/time/clocksource.c
> ===================================================================
> --- linux-2.6.17.orig/kernel/time/clocksource.c
> +++ linux-2.6.17/kernel/time/clocksource.c
> @@ -143,7 +143,7 @@ int clocksource_register(struct clocksou
> /* check if clocksource is already registered */
> if (is_registered_source(c)) {
> printk("register_clocksource: Cannot register %s. "
> - "Already registered!", c->name);
> + "Already registered!", c->name);
> ret = -EBUSY;
> } else {
> /* register it */
> @@ -262,10 +262,10 @@ sysfs_show_available_clocksources(struct
> * Sysfs setup bits:
> */
> static SYSDEV_ATTR(current_clocksource, 0600, sysfs_show_current_clocksources,
> - sysfs_override_clocksource);
> + sysfs_override_clocksource);
>
> static SYSDEV_ATTR(available_clocksource, 0600,
> - sysfs_show_available_clocksources, NULL);
> + sysfs_show_available_clocksources, NULL);
>
> static struct sysdev_class clocksource_sysclass = {
> set_kset_name("clocksource"),
> Index: linux-2.6.17/kernel/timer.c
> ===================================================================
> --- linux-2.6.17.orig/kernel/timer.c
> +++ linux-2.6.17/kernel/timer.c
> @@ -924,7 +924,7 @@ static int change_clocksource(void)
> clock = new;
> clock->cycle_last = now;
> printk(KERN_INFO "Time: %s clocksource has been installed.\n",
> - clock->name);
> + clock->name);
> return 1;
> } else if (clock->update_callback) {
> return clock->update_callback();
> @@ -932,7 +932,7 @@ static int change_clocksource(void)
> return 0;
> }
> #else
> -#define change_clocksource() (0)
> +#define change_clocksource() do { 0; } while(0)
> #endif
>
> /**
> @@ -1149,7 +1149,8 @@ static void update_wall_time(void)
>
> /* accumulate error between NTP and clock interval */
> clock->error += current_tick_length();
> - clock->error -= clock->xtime_interval << (TICK_LENGTH_SHIFT - clock->shift);
> + clock->error -= clock->xtime_interval <<
> + (TICK_LENGTH_SHIFT - clock->shift);
> }
>
> /* correct the clock when NTP error is too big */
>
> --
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
