This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index bee370a..f686992 100644 (file)
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -77,7 +77,7 @@ end:
        return_VALUE(size);
 }
 
-static ssize_t acpi_system_read_dsdt (struct file*, char*, size_t, loff_t*);
+static ssize_t acpi_system_read_dsdt (struct file*, char __user *, size_t, loff_t*);
 
 static struct file_operations acpi_system_dsdt_ops = {
        .read =                 acpi_system_read_dsdt,
@@ -86,13 +86,13 @@ static struct file_operations acpi_system_dsdt_ops = {
 static ssize_t
 acpi_system_read_dsdt (
        struct file             *file,
-       char                    *buffer,
+       char                    __user *buffer,
        size_t                  count,
        loff_t                  *ppos)
 {
        acpi_status             status = AE_OK;
        struct acpi_buffer      dsdt = {ACPI_ALLOCATE_BUFFER, NULL};
-       void                    *data = 0;
+       void                    *data = NULL;
        size_t                  size = 0;
 
        ACPI_FUNCTION_TRACE("acpi_system_read_dsdt");
@@ -120,7 +120,7 @@ acpi_system_read_dsdt (
 }
 
 
-static ssize_t acpi_system_read_fadt (struct file*, char*, size_t, loff_t*);
+static ssize_t acpi_system_read_fadt (struct file*, char __user *, size_t, loff_t*);
 
 static struct file_operations acpi_system_fadt_ops = {
        .read =                 acpi_system_read_fadt,
@@ -129,13 +129,13 @@ static struct file_operations acpi_system_fadt_ops = {
 static ssize_t
 acpi_system_read_fadt (
        struct file             *file,
-       char                    *buffer,
+       char                    __user *buffer,
        size_t                  count,
        loff_t                  *ppos)
 {
        acpi_status             status = AE_OK;
        struct acpi_buffer      fadt = {ACPI_ALLOCATE_BUFFER, NULL};
-       void                    *data = 0;
+       void                    *data = NULL;
        size_t                  size = 0;
 
        ACPI_FUNCTION_TRACE("acpi_system_read_fadt");