take2: enable acpi_os_allocate() to allocate larger memory

Hi,

Here is an updated patch to enable acpi_os_allocate() to allocate larger memory. This patch is based on the feedback from Alan Cox (Thank you!).

Len, could you consider applying this patch?

Thanks,
Kenji Kaneshige

---

I encountered the problem that I could not read /proc/acpi/dsdt on my machine. It turned out that acpi_os_allocate() was failed to allocate buffer. The DSDT on my machine was too large for acpi_os_allocate() to allocate the buffer.

Current acpi_os_allocate() interface is implemented by using kmalloc() whose maximum allocation size is limited. So acpi_os_allocate() would fail if larger size than maximum allocation size of kmalloc was specified. I think this restriction should be removed.

The following patch enables acpi_os_allocate() to allocate larger memory.

---

 linux-2.6.12-rc4-kanesige/drivers/acpi/osl.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff -puN drivers/acpi/osl.c~fix_acpi_os_allocate drivers/acpi/osl.c
@@ -37,6 +37,7 @@
 #include <linux/delay.h>
 #include <linux/workqueue.h>
 #include <linux/nmi.h>
+#include <linux/vmalloc.h>
 #include <acpi/acpi.h>
 #include <asm/io.h>
 #include <acpi/acpi_bus.h>

@@ -145,13 +146,20 @@ acpi_os_vprintf(const char *fmt, va_list
 void *
 acpi_os_allocate(acpi_size size)
 {
-	return kmalloc(size, GFP_KERNEL);
+	void *ptr = kmalloc(size, GFP_KERNEL|__GFP_NORETRY|__GFP_NOWARN);
+	if (!ptr)
+		ptr = vmalloc(size);
+	return ptr;
 }
 
 void
 acpi_os_free(void *ptr)
 {
-	kfree(ptr);
+	if (VMALLOC_START <= (unsigned long)ptr &&
+	    (unsigned long)ptr < VMALLOC_END)
+		vfree(ptr);
+	else
+		kfree(ptr);
 }
 EXPORT_SYMBOL(acpi_os_free);
 

_

-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes Want to be the first software developer in space? Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click