r1136 - trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches

[Simon Horman]

Author: horms
Date: 2004-08-15 19:06:42 -0600 (Sun, 15 Aug 2004)
New Revision: 1136

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6
Log:
Fix symbol problems in SATA update

Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6	2004-08-16 01:04:10 UTC (rev 1135)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6	2004-08-16 01:06:42 UTC (rev 1136)
@@ -6488,6 +6488,37 @@
  	}
  	if (x->id.spi) {
  		spin_lock_bh(&xfrm_state_lock);
+
+#ChangeSet1.1386
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/05/05 15:31:57-03:00 m.c.p@kernel.linux-systeme.com 
+#   [PATCH] copy WARN_ON() definition from 2.6
+#   
+# 
+# include/linux/kernel.h
+#   2004/05/05 05:53:32-03:00 m.c.p@kernel.linux-systeme.com +7 -0
+#   copy WARN_ON() definition from 2.6
+#
+# *** Needed for SATA updates below. Horms 16/08/2004 ***
+# 
+diff -Nru a/include/linux/kernel.h b/include/linux/kernel.h
+--- a/include/linux/kernel.h	2004-08-15 18:05:04 -07:00
++++ b/include/linux/kernel.h	2004-08-15 18:05:04 -07:00
+@@ -196,4 +196,11 @@
+ 
+ #define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)
+ 
++#define WARN_ON(condition) do { \
++	if (unlikely((condition)!=0)) { \
++		printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \
++		dump_stack(); \
++	} \
++} while (0)
++
+ #endif /* _LINUX_KERNEL_H */
+
 # *** The folling section updates SATA for 2.4.26           ***
 # *** from bitkeeper. The patches from the individual       ***
 # *** changesets have been combined in order to allow       ***