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

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

Merge branch 'timers-for-linus-clockevents' of... 

Merge branch 'timers-for-linus-clockevents' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus-clockevents' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  clockevent: export register_device and delta2ns
  clockevents: tick_broadcast_device can become static
parents 3f27c0d2 c81fc2c3

kernel/time/clockevents.c

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ unsigned long clockevent_delta2ns(unsigned long latch, 


	return (unsigned long) clc;

}

EXPORT_SYMBOL_GPL(clockevent_delta2ns);



/**

 * clockevents_set_mode - set the operating mode of a clock event device
@@ -187,6 +188,7 @@ void clockevents_register_device(struct clock_event_device *dev) 


	spin_unlock(&clockevents_lock);

}

EXPORT_SYMBOL_GPL(clockevents_register_device);



/*

 * Noop handler when we shut down an event device

kernel/time/tick-broadcast.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
 * timer stops in C3 state.

 */



struct tick_device tick_broadcast_device;

static struct tick_device tick_broadcast_device;

/* FIXME: Use cpumask_var_t. */

static DECLARE_BITMAP(tick_broadcast_mask, NR_CPUS);

static DECLARE_BITMAP(tmpmask, NR_CPUS);