From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 20 Aug 2005 17:56:09 +0000 (+0000)
Subject: - sync vserver and fedora branches
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~160
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1cc9ecca1d3aef5e1299a2b3234614eee104b749;p=linux-2.6.git

- sync vserver and fedora branches
- mostly inconsequential whitespace change, but will help future merges
  of both
---

diff --git a/fs/exec.c b/fs/exec.c
index ac3f2ac73..f1e7e72da 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -47,7 +47,6 @@
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/rmap.h>
-#include <linux/vs_memory.h>
 #include <linux/acct.h>
 #include <linux/vs_memory.h>
 
@@ -761,11 +760,14 @@ no_thread_group:
 		atomic_set(&newsighand->count, 1);
 		memcpy(newsighand->action, oldsighand->action,
 		       sizeof(newsighand->action));
+
 		write_lock_irq(&tasklist_lock);
 		spin_lock(&oldsighand->siglock);
 		spin_lock(&newsighand->siglock);
+
 		current->sighand = newsighand;
 		recalc_sigpending();
+
 		spin_unlock(&newsighand->siglock);
 		spin_unlock(&oldsighand->siglock);
 		write_unlock_irq(&tasklist_lock);
diff --git a/fs/inode.c b/fs/inode.c
index 4fb853b60..8c983e9a5 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -21,7 +21,6 @@
 #include <linux/pagemap.h>
 #include <linux/cdev.h>
 #include <linux/bootmem.h>
-#include <linux/vs_base.h>
 
 /*
  * This is needed for the following functions: