patch-1.3.74 linux/mm/kmalloc.c

• Lines: 30
• Date: Thu Mar 14 08:13:53 1996
• Orig file: v1.3.73/linux/mm/kmalloc.c
• Orig date: Tue Mar 5 10:11:15 1996

diff -u --recursive --new-file v1.3.73/linux/mm/kmalloc.c linux/mm/kmalloc.c
@@ -176,7 +176,7 @@
 void *kmalloc(size_t size, int priority)
 {
 	unsigned long flags;
-	unsigned long max_addr, type;
+	unsigned long type;
 	int order, i, sz;
 	struct block_header *p;
 	struct page_descriptor *page, **pg;
@@ -187,11 +187,9 @@
 		return (NULL);
 	}
 
-	max_addr = ~0UL;
 	type = MF_USED;
 	pg = &sizes[order].firstfree;
 	if (priority & GFP_DMA) {
-		max_addr = MAX_DMA_ADDRESS;
 		type = MF_DMA;
 		pg = &sizes[order].dmafree;
 	}
@@ -229,7 +227,7 @@
 	sz = BLOCKSIZE(order);
 
 	page = (struct page_descriptor *) __get_free_pages(priority,
-			sizes[order].gfporder, max_addr);
+			sizes[order].gfporder, priority & GFP_DMA);
 
 	if (!page) {
 		static unsigned long last = 0;