rpms/kernel/F-8 linux-2.6-compile-fixes.patch,1.157,1.158

[Chuck Ebbert (cebbert)]

Author: cebbert

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

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
fix broken 2.6.23.10 patch


linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-compile-fixes.patch,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- linux-2.6-compile-fixes.patch	19 Aug 2007 23:02:19 -0000	1.157
+++ linux-2.6-compile-fixes.patch	15 Dec 2007 01:02:53 -0000	1.158
@@ -5,3 +5,78 @@
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
 
+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 */