37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From e858f73d794205cfda77ddfb4cbf86a1b5aeb72f Mon Sep 17 00:00:00 2001
|
|
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Wed, 25 Jul 2012 05:00:02 +0100
|
|
Subject: [PATCH 1/4] hrtimer: Avoid ABI change in 3.2.24
|
|
|
|
struct hrtimer_cpu_base should not be allocated by modules. Move
|
|
the new member clock_was_set to the end and hide it from genksyms.
|
|
Revert the type change of active_bases.
|
|
---
|
|
include/linux/hrtimer.h | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
|
|
index cc07d27..c2012e3 100644
|
|
--- a/include/linux/hrtimer.h
|
|
+++ b/include/linux/hrtimer.h
|
|
@@ -178,8 +178,7 @@ enum hrtimer_base_type {
|
|
*/
|
|
struct hrtimer_cpu_base {
|
|
raw_spinlock_t lock;
|
|
- unsigned int active_bases;
|
|
- unsigned int clock_was_set;
|
|
+ unsigned long active_bases;
|
|
#ifdef CONFIG_HIGH_RES_TIMERS
|
|
ktime_t expires_next;
|
|
int hres_active;
|
|
@@ -190,6 +189,9 @@ struct hrtimer_cpu_base {
|
|
ktime_t max_hang_time;
|
|
#endif
|
|
struct hrtimer_clock_base clock_base[HRTIMER_MAX_CLOCK_BASES];
|
|
+#ifndef __GENKSYMS__
|
|
+ unsigned int clock_was_set;
|
|
+#endif
|
|
};
|
|
|
|
static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time)
|