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

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

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
parents 269f2134 4f95f81a

include/linux/hrtimer.h

+9 −0
Original line number Diff line number Diff line
@@ -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);

kernel/hrtimer.c

+0 −9
Original line number Diff line number Diff line
@@ -153,15 +153,6 @@ static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base) 
		ktime_add(xtim, tomono);

}



/*

 * 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

kernel/time/clocksource.c

+2 −2
Original line number Diff line number Diff line
@@ -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 = {

net/can/bcm.c

+0 −6
Original line number Diff line number Diff line
@@ -412,12 +412,6 @@ static void bcm_rx_changed(struct bcm_op *op, struct can_frame *data) 
	bcm_send_to_user(op, &head, data, 1);

}



/* TODO: move to linux/hrtimer.h */

static inline int hrtimer_callback_running(struct hrtimer *timer)

{

        return timer->state & HRTIMER_STATE_CALLBACK;

}



/*

 * bcm_rx_update_and_send - process a detected relevant receive content change

 *                          1. update the last received data