rpms/kernel/F-10 linux-2.6-compile-fixes.patch,1.184,1.185

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20933

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
fix btrfs build on ppc64

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-compile-fixes.patch,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- linux-2.6-compile-fixes.patch	2 Feb 2009 21:01:17 -0000	1.184
+++ linux-2.6-compile-fixes.patch	8 Feb 2009 17:57:39 -0000	1.185
@@ -4,3 +4,23 @@
 # Please add the errors from gcc before the diffs to save others having
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
+
+  btrfs does not build on ppc64
+  http://marc.info/?l=linux-kernel&m=123404002114219&w=2
+  fs/btrfs/locking.c: In function 'btrfs_path_lock_waiting':
+  fs/btrfs/locking.c:254: error: implicit declaration of function '__raw_spin_is_contended'
+
+Index: linux-2.6.28.noarch/fs/btrfs/locking.c
+===================================================================
+--- linux-2.6.28.noarch.orig/fs/btrfs/locking.c
++++ linux-2.6.28.noarch/fs/btrfs/locking.c
+@@ -241,6 +241,9 @@ int btrfs_tree_locked(struct extent_buff
+  * btrfs_search_slot uses this to decide if it should drop its locks
+  * before doing something expensive like allocating free blocks for cow.
+  */
++#ifndef __raw_spin_is_contended
++#define spin_is_contended(x) (0)
++#endif
+ int btrfs_path_lock_waiting(struct btrfs_path *path, int level)
+ {
+ 	int i;