- resolve conflict with vserver and grsec

Changed files:
    kernel-regressions.patch -> 1.2

diff --git a/kernel-regressions.patch b/kernel-regressions.patch
index 7b249dd65886fd0b31cfacd6b299fd4ddf91329c..bd7c47f65fcd12a43719388ddac38ab3cfe0676e 100644 (file)
--- a/kernel-regressions.patch
+++ b/kernel-regressions.patch
@@ -182,13 +182,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 --- 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;