patch-2.1.34 linux/mm/kmalloc.c

• Lines: 20
• Date: Fri Apr 11 22:10:49 1997
• Orig file: v2.1.33/linux/mm/kmalloc.c
• Orig date: Thu Mar 27 14:40:12 1997

diff -u --recursive --new-file v2.1.33/linux/mm/kmalloc.c linux/mm/kmalloc.c
@@ -266,8 +266,8 @@
 	priority &= GFP_LEVEL_MASK;
 
 /* Sanity check... */
-#if 0	/* no longer valid */
-	if (intr_count && priority != GFP_ATOMIC) {
+
+	if (in_interrupt() && priority != GFP_ATOMIC) {
 		static int count = 0;
 		if (++count < 5) {
 			printk("kmalloc called nonatomically from interrupt %p\n",
@@ -275,7 +275,7 @@
 			priority = GFP_ATOMIC;
 		}
 	}
-#endif
+
 	save_flags(flags);
 	cli();
 	page = *pg;