aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/osl.c2
-rw-r--r--drivers/acpi/processor_core.c2
-rw-r--r--drivers/acpi/tables/tbxface.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 0f6f3bcbc8eb..63060a17f7ed 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -205,7 +205,7 @@ void __iomem *acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
205{ 205{
206 if (phys > ULONG_MAX) { 206 if (phys > ULONG_MAX) {
207 printk(KERN_ERR PREFIX "Cannot map memory that high\n"); 207 printk(KERN_ERR PREFIX "Cannot map memory that high\n");
208 return 0; 208 return NULL;
209 } 209 }
210 if (acpi_gbl_permanent_mmap) 210 if (acpi_gbl_permanent_mmap)
211 /* 211 /*
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 61d976e7af5a..4b3d15fa507a 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -1005,7 +1005,7 @@ static int __init acpi_processor_init(void)
1005#ifdef CONFIG_SMP 1005#ifdef CONFIG_SMP
1006 if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_MADT, 0, 1006 if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_MADT, 0,
1007 (struct acpi_table_header **)&madt))) 1007 (struct acpi_table_header **)&madt)))
1008 madt = 0; 1008 madt = NULL;
1009#endif 1009#endif
1010 1010
1011 acpi_processor_dir = proc_mkdir(ACPI_PROCESSOR_CLASS, acpi_root_dir); 1011 acpi_processor_dir = proc_mkdir(ACPI_PROCESSOR_CLASS, acpi_root_dir);
diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c
index 807978d5381a..81937003fd53 100644
--- a/drivers/acpi/tables/tbxface.c
+++ b/drivers/acpi/tables/tbxface.c
@@ -408,7 +408,7 @@ acpi_get_table(char *signature,
408 } 408 }
409 409
410 if (!acpi_gbl_permanent_mmap) { 410 if (!acpi_gbl_permanent_mmap) {
411 acpi_gbl_root_table_list.tables[i].pointer = 0; 411 acpi_gbl_root_table_list.tables[i].pointer = NULL;
412 } 412 }
413 413
414 return (status); 414 return (status);