Changeset 17802

Timestamp:

10/22/11 16:07:09 (19 months ago)

Author:

BrainSlayer

Message:

use vmalloc instead of kmalloc, since there isnt enough free unframented memory free on some devices

File:

• src/linux/laguna/linux-3.0/drivers/mtd/maps/nvram_kernel.c (modified) (10 diffs)

src/linux/laguna/linux-3.0/drivers/mtd/maps/nvram_kernel.c

@@ -14 +14 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mm.h>
+#include <linux/vmalloc.h>
 //#include <asm/addrspace.h>
 #include <asm/io.h>
@@ -142 +143 @@
 
         if (!t) {
-                if (!(t = kmalloc(sizeof(struct nvram_tuple) + strlen(name) + 1, GFP_ATOMIC)))
+                if (!(t = vmalloc(sizeof(struct nvram_tuple) + strlen(name) + 1)))
                         return NULL;
 
@@ -168 +169 @@
                 nvram_offset = 0;
         else
-                kfree(t);
+                vfree(t);
 }
 
@@ -181 +182 @@
         if ((ret = _nvram_set(name, value))) {
                 /* Consolidate space and try again */
-                if ((header = kmalloc(NVRAM_SPACE, GFP_ATOMIC))) {
+                if ((header = vmalloc(NVRAM_SPACE))) {
                         if (_nvram_commit(header) == 0)
                                 ret = _nvram_set(name, value);
-                        kfree(header);
+                        vfree(header);
                 }
         }
@@ -261 +262 @@
         /* Backup sector blocks to be erased */
         erasesize = ROUNDUP(NVRAM_SPACE, nvram_mtd->erasesize);
-        if (!(buf = kmalloc(erasesize, GFP_KERNEL))) {
+        if (!(buf = vmalloc(erasesize))) {
                 printk("nvram_commit: out of memory\n");
                 return -ENOMEM;
@@ -333 +334 @@
  done:
         mutex_unlock(&nvram_sem);
-        kfree(buf);
+        vfree(buf);
         return ret;
 }
@@ -366 +367 @@
 
         if (count > sizeof(tmp)) {
-                if (!(name = kmalloc(count, GFP_KERNEL)))
+                if (!(name = vmalloc(count)))
                         return -ENOMEM;
         }
@@ -406 +407 @@
 done:
         if (name != tmp)
-                kfree(name);
+                vfree(name);
 
         return ret;
@@ -418 +419 @@
 
         if (count > sizeof(tmp)) {
-                if (!(name = kmalloc(count, GFP_KERNEL)))
+                if (!(name = vmalloc(count)))
                         return -ENOMEM;
         }
@@ -436 +437 @@
  done:
         if (name != tmp)
-                kfree(name);
+                vfree(name);
 
         return ret;