patch-1.3.24 linux/mm/kmalloc.c

• Lines: 49
• Date: Tue Sep 5 12:28:14 1995
• Orig file: v1.3.23/linux/mm/kmalloc.c
• Orig date: Sun Sep 3 12:27:04 1995

diff -u --recursive --new-file v1.3.23/linux/mm/kmalloc.c linux/mm/kmalloc.c
@@ -10,6 +10,8 @@
 /*
  * Modified by Alex Bligh (alex@cconcepts.co.uk) 4 Apr 1994 to use multiple
  * pages. So for 'page' throughout, read 'area'.
+ *
+ * Largely rewritten.. Linus
  */
 
 #include <linux/mm.h>
@@ -17,17 +19,6 @@
 #include <asm/system.h>
 #include <asm/dma.h>
 
-/* I want this low enough for a while to catch errors.
-   I want this number to be increased in the near future:
-        loadable device drivers should use this function to get memory */
-
-#define MAX_KMALLOC_K ((PAGE_SIZE<<(NUM_AREA_ORDERS-1))>>10)
-
-
-/* This defines how many times we should try to allocate a free page before
-   giving up. Normally this shouldn't happen at all. */
-#define MAX_GET_FREE_PAGE_TRIES 4
-
 
 /* Private flags. */
 
@@ -229,17 +220,18 @@
 	}
 
 	/* We need to get a new free page..... */
+	/* This can be done with ints on: This is private to this invocation */
+	restore_flags(flags);
 
 	/* sz is the size of the blocks we're dealing with */
 	sz = BLOCKSIZE(order);
 
-	/* This can be done with ints on: This is private to this invocation */
-	page = (struct page_descriptor *) __get_free_pages(priority & GFP_LEVEL_MASK,
+	page = (struct page_descriptor *) __get_free_pages(priority,
 			sizes[order].gfporder, max_addr);
 
 	if (!page) {
 		static unsigned long last = 0;
-		if (last + 10 * HZ < jiffies) {
+		if (priority != GFP_BUFFER && (last + 10 * HZ < jiffies)) {
 			last = jiffies;
 			printk("Couldn't get a free page.....\n");
 		}