diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-03 16:51:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-03 16:51:10 -0400 |
| commit | afa26be86b65a7183ceac29bdf1f51d6fc6932f0 (patch) | |
| tree | b7b24e134d34f17e62085ecb8a9583e00f1c7248 /kernel/time | |
| parent | 269f21344b23e552c21c9e2d7ca258479dcd7a0a (diff) | |
| parent | 4f95f81a48623982879f4fa80c641933444afd18 (diff) | |
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/time')
| -rw-r--r-- | kernel/time/clocksource.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 73961f35fdc8..dadde5361f32 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) | |||
| 471 | /* | 471 | /* |
| 472 | * Sysfs setup bits: | 472 | * Sysfs setup bits: |
| 473 | */ | 473 | */ |
| 474 | static SYSDEV_ATTR(current_clocksource, 0600, sysfs_show_current_clocksources, | 474 | static SYSDEV_ATTR(current_clocksource, 0644, sysfs_show_current_clocksources, |
| 475 | sysfs_override_clocksource); | 475 | sysfs_override_clocksource); |
| 476 | 476 | ||
| 477 | static SYSDEV_ATTR(available_clocksource, 0600, | 477 | static SYSDEV_ATTR(available_clocksource, 0444, |
| 478 | sysfs_show_available_clocksources, NULL); | 478 | sysfs_show_available_clocksources, NULL); |
| 479 | 479 | ||
| 480 | static struct sysdev_class clocksource_sysclass = { | 480 | static struct sysdev_class clocksource_sysclass = { |