]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix up minor formatting typo in the net-fix-recursive-descent-in-__scm_destroy.patch...
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 7 Nov 2008 23:59:46 +0000 (15:59 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 7 Nov 2008 23:59:46 +0000 (15:59 -0800)
review-2.6.25/net-fix-recursive-descent-in-__scm_destroy.patch
review-2.6.26/net-fix-recursive-descent-in-__scm_destroy.patch

index 9bd7d01132d2b0293bae3e6b56998cbfe8a997a5..286292df7f4814ef012a26941f205c1b83f54e70 100644 (file)
@@ -26,24 +26,22 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
- include/linux/sched.h |    4 +++-
+ include/linux/sched.h |    2 ++
  include/net/scm.h     |    5 +++--
  net/core/scm.c        |   24 +++++++++++++++++++++---
- 3 files changed, 27 insertions(+), 6 deletions(-)
+ 3 files changed, 26 insertions(+), 5 deletions(-)
 
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -1256,7 +1256,9 @@ struct task_struct {
+@@ -1256,6 +1256,8 @@ struct task_struct {
        atomic_t fs_excl;       /* holding fs exclusive resources */
        struct rcu_head rcu;
  
--      /*
 +      struct list_head        *scm_work_list;
 +
-+/*
+       /*
         * cache last used pipe for splice
         */
-       struct pipe_inode_info *splice_pipe;
 --- a/include/net/scm.h
 +++ b/include/net/scm.h
 @@ -14,8 +14,9 @@
index 854779cacf5b0940fd815673de133ab56ad27c50..99902fd9e013730374d82492dc7b64489f7a1f6f 100644 (file)
@@ -26,24 +26,22 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
- include/linux/sched.h |    4 +++-
+ include/linux/sched.h |    2 ++
  include/net/scm.h     |    5 +++--
  net/core/scm.c        |   24 +++++++++++++++++++++---
- 3 files changed, 27 insertions(+), 6 deletions(-)
+ 3 files changed, 26 insertions(+), 5 deletions(-)
 
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -1288,7 +1288,9 @@ struct task_struct {
+@@ -1288,6 +1288,8 @@ struct task_struct {
        atomic_t fs_excl;       /* holding fs exclusive resources */
        struct rcu_head rcu;
  
--      /*
 +      struct list_head        *scm_work_list;
 +
-+/*
+       /*
         * cache last used pipe for splice
         */
-       struct pipe_inode_info *splice_pipe;
 --- a/include/net/scm.h
 +++ b/include/net/scm.h
 @@ -14,8 +14,9 @@