Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt

Browse source 
* 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
This commit is contained in:
Linus Torvalds 2008-05-03 13:51:10 -07:00
commit afa26be86b
4 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/linux/hrtimer.h
View file

@ -316,6 +316,15 @@ static inline int hrtimer_is_queued(struct hrtimer *timer)
(HRTIMER_STATE_ENQUEUED | HRTIMER_STATE_PENDING); (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: */ /* Forward a hrtimer so it expires after now: */
extern u64 extern u64
hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval); hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval);

9
kernel/hrtimer.c
View file

@ -153,15 +153,6 @@ static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base)
ktime_add(xtim, tomono); 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 * Functions and macros which are different for UP/SMP systems are kept in a
* single place * single place

4
kernel/time/clocksource.c
View file

@ -471,10 +471,10 @@ sysfs_show_available_clocksources(struct sys_device *dev, char *buf)
/* /*
* Sysfs setup bits: * 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); sysfs_override_clocksource);
static SYSDEV_ATTR(available_clocksource, 0600, static SYSDEV_ATTR(available_clocksource, 0444,
sysfs_show_available_clocksources, NULL); sysfs_show_available_clocksources, NULL);
static struct sysdev_class clocksource_sysclass = { static struct sysdev_class clocksource_sysclass = {

6
net/can/bcm.c
View file

@ -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); 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 * bcm_rx_update_and_send - process a detected relevant receive content change
* 1. update the last received data * 1. update the last received data