commit afa26be86b65a7183ceac29bdf1f51d6fc6932f0 Merge: 269f213... 4f95f81... Author: Linus Torvalds Date: Sat May 3 13:51:10 2008 -0700 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 commit 269f21344b23e552c21c9e2d7ca258479dcd7a0a Author: Ulrich Drepper Date: Sat May 3 15:28:45 2008 -0400 tiny mq_open optimization A very small cleanup for mq_open. We do not have to call set_close_on_exit if we create the file descriptor right away with the flag set. We have a function for this now. The resulting code is smaller and a tiny bit faster. Signed-off-by: Ulrich Drepper Signed-off-by: Linus Torvalds commit d35c7b0e54a596c5a8134d75999b7f391a9c6550 Author: Ulrich Drepper Date: Sat May 3 15:10:37 2008 -0400 unified (weak) sys_pipe implementation This replaces the duplicated arch-specific versions of "sys_pipe()" with one unified implementation. This removes almost 250 lines of duplicated code. It's marked __weak, so that *if* an architecture wants to override the default implementation it can do so by simply having its own replacement version, since many architectures use alternate calling conventions for the 'pipe()' system call for legacy reasons (ie traditional UNIX implementations often return the two file descriptors in registers) I still haven't changed the cris version even though Linus says the BKL isn't needed. The arch maintainer can easily do it if there are really no obstacles. Signed-off-by: Ulrich Drepper Signed-off-by: Linus Torvalds commit 4f95f81a48623982879f4fa80c641933444afd18 Author: Heiko Carstens Date: Sat May 3 14:23:14 2008 +0200 clocksource: allow read access to available/current_clocksource There is no harm, when users can read the info and we ask often enough during debugging for this kind of information. Signed-off-by: Heiko Carstens Cc: Andrew Morton Cc: John Stultz Signed-off-by: Thomas Gleixner commit 4359a023a8c3b247b348c310bf510b23f3c1ab64 Author: Heiko Carstens Date: Fri May 2 12:49:40 2008 +0200 clocksource: Fix permissions for available_clocksource File permissions for /sys/devices/system/clocksource/clocksource0/available_clocksource are 600 which allows write access. But this is in fact a read only file. So change permissions to 400. Signed-off-by: Heiko Carstens Cc: John Stultz Cc: Andrew Morton Signed-off-by: Thomas Gleixner commit 4346f65426cbceb64794b468e4af6f5632d58c5e Author: Oliver Hartkopp Date: Wed Apr 30 23:04:37 2008 +0200 hrtimer: remove duplicate helper function The helper function hrtimer_callback_running() is used in kernel/hrtimer.c as well as in the updated net/can/bcm.c which now supports hrtimers. Moving the helper function to hrtimer.h removes the duplicate definition in the C-files. Signed-off-by: Oliver Hartkopp Cc: David Miller Signed-off-by: Thomas Gleixner