[Hackndev-commit] SF.net SVN: hackndev: [991] linux4palm/linux/trunk/arch/arm/armboot/armboot .c

[<far...@us...>]

Revision: 991
          http://svn.sourceforge.net/hackndev/?rev=991&view=rev
Author:   farcaller
Date:     2007-05-25 11:01:27 -0700 (Fri, 25 May 2007)

Log Message:
-----------
Fixed armboot

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/armboot/armboot.c

Modified: linux4palm/linux/trunk/arch/arm/armboot/armboot.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/armboot/armboot.c	2007-05-24 22:55:56 UTC (rev 990)
+++ linux4palm/linux/trunk/arch/arm/armboot/armboot.c	2007-05-25 18:01:27 UTC (rev 991)
@@ -16,7 +16,6 @@
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/fs.h>
-#include <linux/config.h>
 
 #include <asm/types.h>
 #include <asm/setup.h>
@@ -161,7 +160,7 @@
 		size -= relocsize;
 		
 		/* Allocate said block... (always 64k to please your kmallocness) */
-		block = (unsigned char*)kmalloc(64*1024, SLAB_KERNEL);
+		block = (unsigned char*)kmalloc(64*1024, GFP_KERNEL);
 		if (!block) {
 			printk(KERN_ERR "Failed to grab mem chunk for kernel.\n"
 					"Still %d bytes waiting\n", size);
@@ -192,7 +191,7 @@
 		size_initrd -= relocsize;
 		
 		/* Allocate said block... (always 64k to please your kmallocness) */
-		block = (unsigned char*)kmalloc(64*1024, SLAB_KERNEL);
+		block = (unsigned char*)kmalloc(64*1024, GFP_KERNEL);
 		if (!block) {
 			printk(KERN_ERR "Failed to grab mem chunk for initrd.\n"
 					"Still %d bytes waiting\n", size_initrd);
@@ -217,7 +216,7 @@
 	addrmap[mappos-1].last = 1;
 	
 	/* Nowadays we get an address from the kernel. */
-	asmaddr = (unsigned int*)kmalloc(64*1024, SLAB_KERNEL);
+	asmaddr = (unsigned int*)kmalloc(64*1024, GFP_KERNEL);
 	memcpy(asmaddr, &armboot_asm, 16384); // 16kb
 	armboot_ptr = (void(*)(int,int,int,int))asmaddr;
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.