vserver 1.9.5.x5

[linux-2.6.git] / drivers / acpi / event.c

diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index 43323b4..43c49f6 100644 (file)
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
@@ -16,7 +16,7 @@
 ACPI_MODULE_NAME               ("event")
 
 /* Global vars for handling event proc entry */
-static spinlock_t              acpi_system_event_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(acpi_system_event_lock);
 int                            event_is_open = 0;
 extern struct list_head                acpi_bus_event_list;
 extern wait_queue_head_t       acpi_bus_event_queue;
@@ -42,7 +42,7 @@ out_busy:
 static ssize_t
 acpi_system_read_event (
        struct file             *file,
-       char                    *buffer,
+       char                    __user *buffer,
        size_t                  count,
        loff_t                  *ppos)
 {