From 5bbd0d838b7453d8c2225c437edfda3fae9652ea Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Tue, 13 Feb 2007 16:11:36 -0800
Subject: [PATCH] --- yaml --- r: 48672 b: refs/heads/master c:
 70c0846e430881967776582e13aefb81407919f1 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/acpi/osl.c            | 2 +-
 trunk/drivers/acpi/processor_core.c | 2 +-
 trunk/drivers/acpi/tables/tbxface.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a56741a3ec83..89b0415108ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3ccb06f3b8e0cf42b579db21f3ca7f17fcc3f38
+refs/heads/master: 70c0846e430881967776582e13aefb81407919f1
diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c
index 0f6f3bcbc8eb..63060a17f7ed 100644
--- a/trunk/drivers/acpi/osl.c
+++ b/trunk/drivers/acpi/osl.c
@@ -205,7 +205,7 @@ void __iomem *acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
 {
 	if (phys > ULONG_MAX) {
 		printk(KERN_ERR PREFIX "Cannot map memory that high\n");
-		return 0;
+		return NULL;
 	}
 	if (acpi_gbl_permanent_mmap)
 		/*
diff --git a/trunk/drivers/acpi/processor_core.c b/trunk/drivers/acpi/processor_core.c
index 61d976e7af5a..4b3d15fa507a 100644
--- a/trunk/drivers/acpi/processor_core.c
+++ b/trunk/drivers/acpi/processor_core.c
@@ -1005,7 +1005,7 @@ static int __init acpi_processor_init(void)
 #ifdef CONFIG_SMP
 	if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_MADT, 0,
 				(struct acpi_table_header **)&madt)))
-		madt = 0;
+		madt = NULL;
 #endif
 
 	acpi_processor_dir = proc_mkdir(ACPI_PROCESSOR_CLASS, acpi_root_dir);
diff --git a/trunk/drivers/acpi/tables/tbxface.c b/trunk/drivers/acpi/tables/tbxface.c
index 807978d5381a..81937003fd53 100644
--- a/trunk/drivers/acpi/tables/tbxface.c
+++ b/trunk/drivers/acpi/tables/tbxface.c
@@ -408,7 +408,7 @@ acpi_get_table(char *signature,
 		}
 
 		if (!acpi_gbl_permanent_mmap) {
-			acpi_gbl_root_table_list.tables[i].pointer = 0;
+			acpi_gbl_root_table_list.tables[i].pointer = NULL;
 		}
 
 		return (status);