SOURCES: kernel-regressions.patch - resolve conflict with vserver and grsec

[baggins]

Author: baggins                      Date: Sat Dec 13 20:31:34 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- resolve conflict with vserver and grsec

---- Files affected:
SOURCES:
   kernel-regressions.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/kernel-regressions.patch
diff -u SOURCES/kernel-regressions.patch:1.1 SOURCES/kernel-regressions.patch:1.2
--- SOURCES/kernel-regressions.patch:1.1	Sat Dec 13 21:19:52 2008
+++ SOURCES/kernel-regressions.patch	Sat Dec 13 21:31:28 2008
@@ -182,13 +182,13 @@
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -19,6 +19,7 @@
+ #include <linux/module.h>
+ #include <linux/security.h>
+ #include <linux/ptrace.h>
++#include <linux/smp_lock.h>
  #include <linux/signal.h>
  #include <linux/rcupdate.h>
  #include <linux/pid_namespace.h>
-+#include <linux/smp_lock.h>
- 
- #include <asm/poll.h>
- #include <asm/siginfo.h>
 @@ -175,6 +176,11 @@ static int setfl(int fd, struct file * f
  	if (error)
  		return error;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-regressions.patch?r1=1.1&r2=1.2&f=u