Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 19 insertions, 1 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index 05e0b6f4365b..2b55b74cd999 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -325,7 +325,7 @@ static inline int mm_alloc_pgd(struct mm_struct * mm)
 
 static inline void mm_free_pgd(struct mm_struct * mm)
 {
-        pgd_free(mm->pgd);
+        pgd_free(mm, mm->pgd);
 }
 #else
 #define dup_mmap(mm, oldmm)     (0)
@@ -1118,6 +1118,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
 #ifdef CONFIG_SECURITY
         p->security = NULL;
 #endif
+        p->cap_bset = current->cap_bset;
         p->io_context = NULL;
         p->audit_context = NULL;
         cgroup_fork(p);
@@ -1450,6 +1451,23 @@ long do_fork(unsigned long clone_flags,
         int trace = 0;
         long nr;
 
+        /*
+         * We hope to recycle these flags after 2.6.26
+         */
+        if (unlikely(clone_flags & CLONE_STOPPED)) {
+                static int __read_mostly count = 100;
+
+                if (count > 0 && printk_ratelimit()) {
+                        char comm[TASK_COMM_LEN];
+
+                        count--;
+                        printk(KERN_INFO "fork(): process `%s' used deprecated "
+                                        "clone flags 0x%lx\n",
+                                get_task_comm(comm, current),
+                                clone_flags & CLONE_STOPPED);
+                }
+        }
+
         if (unlikely(current->ptrace)) {
                 trace = fork_traceflag (clone_flags);
                 if (trace)