diff options
| author | John Stultz | 2012-02-09 23:24:35 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-02-10 19:06:19 +0100 |
| commit | 79ef07162fb088f8afe7709881e2b5e2a4098202 (patch) | |
| tree | 254a10a677ce5984c8d1b3980c147a9a73ff185e /drivers/staging/android | |
| parent | staging: android-alarm: Fix namespace collision with upstreamed alarmtimers (diff) | |
| download | kernel-qcow2-linux-79ef07162fb088f8afe7709881e2b5e2a4098202.tar.gz kernel-qcow2-linux-79ef07162fb088f8afe7709881e2b5e2a4098202.tar.xz kernel-qcow2-linux-79ef07162fb088f8afe7709881e2b5e2a4098202.zip | |
staging: android-alarm: HACK: wakelock workaround
Allow Android alarmtimer device to build while wakelocks are still
out of tree.
CC: Arve Hjønnevåg <arve@android.com>
CC: Android Kernel Team <kernel-team@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
| -rw-r--r-- | drivers/staging/android/alarm-dev.c | 13 | ||||
| -rw-r--r-- | drivers/staging/android/alarm.c | 12 |
2 files changed, 23 insertions, 2 deletions
diff --git a/drivers/staging/android/alarm-dev.c b/drivers/staging/android/alarm-dev.c index 758d828784f4..03efb34cbe2e 100644 --- a/drivers/staging/android/alarm-dev.c +++ b/drivers/staging/android/alarm-dev.c @@ -22,13 +22,24 @@ #include <linux/sched.h> #include <linux/spinlock.h> #include <linux/uaccess.h> -#include <linux/wakelock.h> #include "android_alarm.h" +/* XXX - Hack out wakelocks, while they are out of tree */ +struct wake_lock { + int i; +}; +#define wake_lock(x) +#define wake_lock_timeout(x, y) +#define wake_unlock(x) +#define WAKE_LOCK_SUSPEND 0 +#define wake_lock_init(x, y, z) ((x)->i = 1) +#define wake_lock_destroy(x) + #define ANDROID_ALARM_PRINT_INFO (1U << 0) #define ANDROID_ALARM_PRINT_IO (1U << 1) #define ANDROID_ALARM_PRINT_INT (1U << 2) + static int debug_mask = ANDROID_ALARM_PRINT_INFO; module_param_named(debug_mask, debug_mask, int, S_IRUGO | S_IWUSR | S_IWGRP); diff --git a/drivers/staging/android/alarm.c b/drivers/staging/android/alarm.c index 1f8bb5ca5682..5370fdc8b016 100644 --- a/drivers/staging/android/alarm.c +++ b/drivers/staging/android/alarm.c @@ -21,9 +21,19 @@ #include <linux/rtc.h> #include <linux/sched.h> #include <linux/spinlock.h> -#include <linux/wakelock.h> #include "android_alarm.h" +/* XXX - Hack out wakelocks, while they are out of tree */ +struct wake_lock { + int i; +}; +#define wake_lock(x) +#define wake_lock_timeout(x, y) +#define wake_unlock(x) +#define WAKE_LOCK_SUSPEND 0 +#define wake_lock_init(x, y, z) ((x)->i = 1) +#define wake_lock_destroy(x) + #define ANDROID_ALARM_PRINT_ERROR (1U << 0) #define ANDROID_ALARM_PRINT_INIT_STATUS (1U << 1) #define ANDROID_ALARM_PRINT_TSET (1U << 2) |