diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-03 13:51:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-03 13:51:10 -0700 |
| commit | afa26be86b65a7183ceac29bdf1f51d6fc6932f0 (patch) | |
| tree | b7b24e134d34f17e62085ecb8a9583e00f1c7248 /kernel | |
| parent | 269f21344b23e552c21c9e2d7ca258479dcd7a0a (diff) | |
| parent | 4f95f81a48623982879f4fa80c641933444afd18 (diff) | |
| download | kernel-crypto-afa26be86b65a7183ceac29bdf1f51d6fc6932f0.tar.gz kernel-crypto-afa26be86b65a7183ceac29bdf1f51d6fc6932f0.tar.xz kernel-crypto-afa26be86b65a7183ceac29bdf1f51d6fc6932f0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
clocksource: allow read access to available/current_clocksource
clocksource: Fix permissions for available_clocksource
hrtimer: remove duplicate helper function
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/hrtimer.c | 9 | ||||
| -rw-r--r-- | kernel/time/clocksource.c | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 9af1d6a8095..421be5fe5cc 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 73961f35fdc..dadde5361f3 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c @@ -471,10 +471,10 @@ sysfs_show_available_clocksources(struct sys_device *dev, char *buf) /* * Sysfs setup bits: */ -static SYSDEV_ATTR(current_clocksource, 0600, sysfs_show_current_clocksources, +static SYSDEV_ATTR(current_clocksource, 0644, sysfs_show_current_clocksources, sysfs_override_clocksource); -static SYSDEV_ATTR(available_clocksource, 0600, +static SYSDEV_ATTR(available_clocksource, 0444, sysfs_show_available_clocksources, NULL); static struct sysdev_class clocksource_sysclass = { |