rpms/kernel/F-10 linux-2.6.27.7-alsa-driver-fixups.patch,1.1,1.2

Chuck Ebbert cebbert at fedoraproject.org
Tue Dec 9 04:54:37 UTC 2008


Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26476

Modified Files:
	linux-2.6.27.7-alsa-driver-fixups.patch 
Log Message:
add hrtimer fn wrappers need by ALSA

linux-2.6.27.7-alsa-driver-fixups.patch:

Index: linux-2.6.27.7-alsa-driver-fixups.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6.27.7-alsa-driver-fixups.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.27.7-alsa-driver-fixups.patch	8 Dec 2008 05:19:38 -0000	1.1
+++ linux-2.6.27.7-alsa-driver-fixups.patch	9 Dec 2008 04:54:06 -0000	1.2
@@ -380,3 +380,100 @@
  int ps3av_audio_mute(int mute)
  {
  	return ps3av_set_audio_mute(mute ? PS3AV_CMD_MUTE_ON
+Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=63ca243b271f5b44e0b1057003cf498b6d0fadf7
+Commit:     63ca243b271f5b44e0b1057003cf498b6d0fadf7
+Parent:     8ff3e8e85fa6c312051134b3953e397feb639f51
+Author:     Arjan van de Ven <arjan at linux.intel.com>
+AuthorDate: Mon Sep 1 14:35:02 2008 -0700
+Committer:  Arjan van de Ven <arjan at linux.intel.com>
+CommitDate: Fri Sep 5 21:35:05 2008 -0700
+
+    hrtimer: add abstraction functions for accessing the "expires" member
+    
+    In order to be able to turn hrtimers into range based, we need to provide
+    accessor functions for getting to the "expires" ktime_t member of the
+    struct hrtimer.
+    
+    This patch adds a set of accessors for this purpose:
+    * hrtimer_set_expires
+    * hrtimer_set_expires_tv64
+    * hrtimer_add_expires
+    * hrtimer_add_expires_ns
+    * hrtimer_get_expires
+    * hrtimer_get_expires_tv64
+    * hrtimer_get_expires_ns
+    * hrtimer_expires_remaining
+    * hrtimer_start_expires
+    
+    No users of these new accessors are added yet; these follow in later patches.
+    Hopefully this patch can even go into 2.6.27-rc so that the conversions will
+    not have a bottleneck in -next
+    
+    Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
+---
+ include/linux/hrtimer.h |   45 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 45 insertions(+), 0 deletions(-)
+
+diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
+index becd17d..9900e99 100644
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -217,6 +217,45 @@ static inline int hrtimer_is_hres_active(struct hrtimer *timer)
+ 	return timer->base->cpu_base->hres_active;
+ }
+ 
++static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time)
++{
++	timer->expires = time;
++}
++static inline void hrtimer_set_expires_tv64(struct hrtimer *timer, s64 tv64)
++{
++	timer->expires.tv64 = tv64;
++}
++
++static inline void hrtimer_add_expires(struct hrtimer *timer, ktime_t time)
++{
++	timer->expires = ktime_add_safe(timer->expires, time);
++}
++
++static inline void hrtimer_add_expires_ns(struct hrtimer *timer, unsigned long ns)
++{
++	timer->expires = ktime_add_ns(timer->expires, ns);
++}
++
++static inline ktime_t hrtimer_get_expires(const struct hrtimer *timer)
++{
++	return timer->expires;
++}
++
++static inline s64 hrtimer_get_expires_tv64(const struct hrtimer *timer)
++{
++	return timer->expires.tv64;
++}
++
++static inline s64 hrtimer_get_expires_ns(const struct hrtimer *timer)
++{
++	return ktime_to_ns(timer->expires);
++}
++
++static inline ktime_t hrtimer_expires_remaining(const struct hrtimer *timer)
++{
++    return ktime_sub(timer->expires, timer->base->get_time());
++}
++
+ /*
+  * The resolution of the clocks. The resolution value is returned in
+  * the clock_getres() system call to give application programmers an
+@@ -287,6 +326,12 @@ extern int hrtimer_start(struct hrtimer *timer, ktime_t tim,
+ extern int hrtimer_cancel(struct hrtimer *timer);
+ extern int hrtimer_try_to_cancel(struct hrtimer *timer);
+ 
++static inline int hrtimer_start_expires(struct hrtimer *timer,
++						enum hrtimer_mode mode)
++{
++	return hrtimer_start(timer, hrtimer_get_expires(timer), mode);
++}
++
+ static inline int hrtimer_restart(struct hrtimer *timer)
+ {
+ 	return hrtimer_start(timer, timer->expires, HRTIMER_MODE_ABS);




More information about the fedora-extras-commits mailing list