diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-i386/acpi.h | 26 | ||||
-rw-r--r-- | include/asm-x86_64/acpi.h | 26 | ||||
-rw-r--r-- | include/linux/backlight.h | 2 |
3 files changed, 5 insertions, 49 deletions
diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h index c80b3a94511a..7cfad93edf10 100644 --- a/include/asm-i386/acpi.h +++ b/include/asm-i386/acpi.h | |||
@@ -56,30 +56,8 @@ | |||
56 | #define ACPI_ENABLE_IRQS() local_irq_enable() | 56 | #define ACPI_ENABLE_IRQS() local_irq_enable() |
57 | #define ACPI_FLUSH_CPU_CACHE() wbinvd() | 57 | #define ACPI_FLUSH_CPU_CACHE() wbinvd() |
58 | 58 | ||
59 | 59 | int __acpi_acquire_global_lock(unsigned int *lock); | |
60 | static inline int | 60 | int __acpi_release_global_lock(unsigned int *lock); |
61 | __acpi_acquire_global_lock (unsigned int *lock) | ||
62 | { | ||
63 | unsigned int old, new, val; | ||
64 | do { | ||
65 | old = *lock; | ||
66 | new = (((old & ~0x3) + 2) + ((old >> 1) & 0x1)); | ||
67 | val = cmpxchg(lock, old, new); | ||
68 | } while (unlikely (val != old)); | ||
69 | return (new < 3) ? -1 : 0; | ||
70 | } | ||
71 | |||
72 | static inline int | ||
73 | __acpi_release_global_lock (unsigned int *lock) | ||
74 | { | ||
75 | unsigned int old, new, val; | ||
76 | do { | ||
77 | old = *lock; | ||
78 | new = old & ~0x3; | ||
79 | val = cmpxchg(lock, old, new); | ||
80 | } while (unlikely (val != old)); | ||
81 | return old & 0x1; | ||
82 | } | ||
83 | 61 | ||
84 | #define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \ | 62 | #define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \ |
85 | ((Acq) = __acpi_acquire_global_lock((unsigned int *) GLptr)) | 63 | ((Acq) = __acpi_acquire_global_lock((unsigned int *) GLptr)) |
diff --git a/include/asm-x86_64/acpi.h b/include/asm-x86_64/acpi.h index 9d1916e59c04..6b6fc6f8be7e 100644 --- a/include/asm-x86_64/acpi.h +++ b/include/asm-x86_64/acpi.h | |||
@@ -54,30 +54,8 @@ | |||
54 | #define ACPI_ENABLE_IRQS() local_irq_enable() | 54 | #define ACPI_ENABLE_IRQS() local_irq_enable() |
55 | #define ACPI_FLUSH_CPU_CACHE() wbinvd() | 55 | #define ACPI_FLUSH_CPU_CACHE() wbinvd() |
56 | 56 | ||
57 | 57 | int __acpi_acquire_global_lock(unsigned int *lock); | |
58 | static inline int | 58 | int __acpi_release_global_lock(unsigned int *lock); |
59 | __acpi_acquire_global_lock (unsigned int *lock) | ||
60 | { | ||
61 | unsigned int old, new, val; | ||
62 | do { | ||
63 | old = *lock; | ||
64 | new = (((old & ~0x3) + 2) + ((old >> 1) & 0x1)); | ||
65 | val = cmpxchg(lock, old, new); | ||
66 | } while (unlikely (val != old)); | ||
67 | return (new < 3) ? -1 : 0; | ||
68 | } | ||
69 | |||
70 | static inline int | ||
71 | __acpi_release_global_lock (unsigned int *lock) | ||
72 | { | ||
73 | unsigned int old, new, val; | ||
74 | do { | ||
75 | old = *lock; | ||
76 | new = old & ~0x3; | ||
77 | val = cmpxchg(lock, old, new); | ||
78 | } while (unlikely (val != old)); | ||
79 | return old & 0x1; | ||
80 | } | ||
81 | 59 | ||
82 | #define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \ | 60 | #define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \ |
83 | ((Acq) = __acpi_acquire_global_lock((unsigned int *) GLptr)) | 61 | ((Acq) = __acpi_acquire_global_lock((unsigned int *) GLptr)) |
diff --git a/include/linux/backlight.h b/include/linux/backlight.h index 75e91f5b6a04..a5cf1beacb44 100644 --- a/include/linux/backlight.h +++ b/include/linux/backlight.h | |||
@@ -54,7 +54,7 @@ struct backlight_device { | |||
54 | }; | 54 | }; |
55 | 55 | ||
56 | extern struct backlight_device *backlight_device_register(const char *name, | 56 | extern struct backlight_device *backlight_device_register(const char *name, |
57 | void *devdata, struct backlight_properties *bp); | 57 | struct device *dev,void *devdata,struct backlight_properties *bp); |
58 | extern void backlight_device_unregister(struct backlight_device *bd); | 58 | extern void backlight_device_unregister(struct backlight_device *bd); |
59 | 59 | ||
60 | #define to_backlight_device(obj) container_of(obj, struct backlight_device, class_dev) | 60 | #define to_backlight_device(obj) container_of(obj, struct backlight_device, class_dev) |