rpms/kernel/F-7 linux-2.6-compile-fixes.patch, 1.151, 1.152 kernel-2.6.spec, 1.3401, 1.3402

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31494

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-compile-fixes.patch 
Log Message:
* Thu Dec 14 2007 Chuck Ebbert <cebbert at redhat.com> 2.6.23.10-51
- Add compile fixes.


linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: linux-2.6-compile-fixes.patch
diff -N linux-2.6-compile-fixes.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-compile-fixes.patch	15 Dec 2007 01:30:48 -0000	1.152
@@ -0,0 +1,84 @@
+#
+# Small compile fixes (For more involved fixes, please use a separate patch).
+#
+# 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.
+#
+
+[wait_event_freezable() is missing in 2.6.23.10]
+
+From:
+
+Commit:     e42837bcd35b75bb59ae5d3e62f87be1aeeb05c3
+Parent:     2e1318956ce6bf149af5c5e98499b5cd99f99c89
+Author:     Rafael J. Wysocki <rjw at sisk.pl>
+AuthorDate: Thu Oct 18 03:04:45 2007 -0700
+Committer:  Linus Torvalds <torvalds at woody.linux-foundation.org>
+CommitDate: Thu Oct 18 14:37:19 2007 -0700
+
+    freezer: introduce freezer-friendly waiting macros
+
+
+diff --git a/include/linux/freezer.h b/include/linux/freezer.h
+index efded00..0893499 100644
+--- a/include/linux/freezer.h
++++ b/include/linux/freezer.h
+@@ -4,6 +4,7 @@
+ #define FREEZER_H_INCLUDED
+ 
+ #include <linux/sched.h>
++#include <linux/wait.h>
+ 
+ #ifdef CONFIG_PM_SLEEP
+ /*
+@@ -126,6 +127,36 @@ static inline void set_freezable(void)
+ 	current->flags &= ~PF_NOFREEZE;
+ }
+ 
++/*
++ * Freezer-friendly wrappers around wait_event_interruptible() and
++ * wait_event_interruptible_timeout(), originally defined in <linux/wait.h>
++ */
++
++#define wait_event_freezable(wq, condition)				\
++({									\
++	int __retval;							\
++	do {								\
++		__retval = wait_event_interruptible(wq, 		\
++				(condition) || freezing(current));	\
++		if (__retval && !freezing(current))			\
++			break;						\
++		else if (!(condition))					\
++			__retval = -ERESTARTSYS;			\
++	} while (try_to_freeze());					\
++	__retval;							\
++})
++
++
++#define wait_event_freezable_timeout(wq, condition, timeout)		\
++({									\
++	long __retval = timeout;					\
++	do {								\
++		__retval = wait_event_interruptible_timeout(wq,		\
++				(condition) || freezing(current),	\
++				__retval); 				\
++	} while (try_to_freeze());					\
++	__retval;							\
++})
+ #else /* !CONFIG_PM_SLEEP */
+ static inline int frozen(struct task_struct *p) { return 0; }
+ static inline int freezing(struct task_struct *p) { return 0; }
+@@ -143,6 +174,13 @@ static inline void freezer_do_not_count(void) {}
+ static inline void freezer_count(void) {}
+ static inline int freezer_should_skip(struct task_struct *p) { return 0; }
+ static inline void set_freezable(void) {}
++
++#define wait_event_freezable(wq, condition)				\
++		wait_event_interruptible(wq, condition)
++
++#define wait_event_freezable_timeout(wq, condition, timeout)		\
++		wait_event_interruptible_timeout(wq, condition, timeout)
++
+ #endif /* !CONFIG_PM_SLEEP */
+ 
+ #endif	/* FREEZER_H_INCLUDED */


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3401
retrieving revision 1.3402
diff -u -r1.3401 -r1.3402
--- kernel-2.6.spec	15 Dec 2007 00:41:49 -0000	1.3401
+++ kernel-2.6.spec	15 Dec 2007 01:30:48 -0000	1.3402
@@ -639,6 +639,8 @@
 Patch800: linux-2.6-wakeups-hdaps.patch
 Patch801: linux-2.6-wakeups.patch
 
+Patch820: linux-2.6-compile-fixes.patch
+
 # PS3 updates from 2.6.23
 # PS3 Wireless support hasn't yet been merged
 Patch1300: linux-2.6-ps3-gelic-wireless.patch
@@ -1363,6 +1365,14 @@
 # Fix time distortion in pm_trace (bz 250238)
 ApplyPatch linux-2.6-pmtrace-time-fix.patch
 
+#
+# misc small stuff to make things compile
+#
+C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-compile-fixes.patch | awk '{print $1}')
+if [ "$C" -gt 10 ]; then
+ApplyPatch linux-2.6-compile-fixes.patch
+fi
+
 # END OF PATCH APPLICATIONS
 
 # Any further pre-build tree manipulations happen here.
@@ -2285,6 +2295,9 @@
 %endif
 
 %changelog
+* Thu Dec 14 2007 Chuck Ebbert <cebbert at redhat.com> 2.6.23.10-51
+- Add compile fixes.
+
 * Thu Dec 14 2007 Chuck Ebbert <cebbert at redhat.com> 2.6.23.10-50
 - Linux 2.6.23.10