Linus,
please pull hrtimer updates from
  ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git master
 - permission fixups for /sys/devices/.../clocksource

 - fold duplicated inline function into hrtimer.h
Thanks,

	tglx
---

Heiko Carstens (2):

      clocksource: Fix permissions for available_clocksource

      clocksource: allow read access to available/current_clocksource
Oliver Hartkopp (1):

      hrtimer: remove duplicate helper function
 include/linux/hrtimer.h   |    9 +++++++++

 kernel/hrtimer.c          |    9 ---------

 kernel/time/clocksource.c |    4 ++--

 net/can/bcm.c             |    6 ------

 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h

index 31a4d65..6d93dce 100644

--- a/include/linux/hrtimer.h

+++ b/include/linux/hrtimer.h

@@ -316,6 +316,15 @@ static inline int hrtimer_is_queued(struct hrtimer *timer)

 		(HRTIMER_STATE_ENQUEUED | HRTIMER_STATE_PENDING);

 }
+/*

+ * Helper function to check, whether the timer is running the callback

+ * function

+ */

+static inline int hrtimer_callback_running(struct hrtimer *timer)

+{

+	return timer->state & HRTIMER_STATE_CALLBACK;

+}

+

 /* Forward a hrtimer so it expires after now: */

 extern u64

 hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval);

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c

index 9af1d6a..421be5f 100644

--- a/kernel/hrtimer.c

+++ b/kernel/hrtimer.c

@@ -154,15 +154,6 @@ static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base)

 }
 /*

- * Helper function to check, whether the timer is running the callback

- * function

- */

-static inline int hrtimer_callback_running(struct hrtimer *timer)

-{

-	return timer->state & HRTIMER_STATE_CALLBACK;

-}

-

-/*

  * Functions and macros which are different for UP/SMP systems are kept in a

  * single place

  */

diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c

index 73961f3..dadde53 100644...
[ message continues ]