Merge branch 'misc.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / kernel / signal.c

diff --git a/kernel/signal.c b/kernel/signal.c
index 36a523640894f47ed66acf161afe7fc9d264ce12..babb36d3d03911df511f55b25e68ff179c6cc9da 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1036,8 +1036,7 @@ static int __send_signal(int sig, struct siginfo *info, struct task_struct *t,
        else
                override_rlimit = 0;
 
-       q = __sigqueue_alloc(sig, t, GFP_ATOMIC | __GFP_NOTRACK_FALSE_POSITIVE,
-               override_rlimit);
+       q = __sigqueue_alloc(sig, t, GFP_ATOMIC, override_rlimit);
        if (q) {
                list_add_tail(&q->list, &pending->list);
                switch ((unsigned long) info) {
@@ -2682,7 +2681,7 @@ enum siginfo_layout siginfo_layout(int sig, int si_code)
                        [SIGSEGV] = { NSIGSEGV, SIL_FAULT },
                        [SIGBUS]  = { NSIGBUS,  SIL_FAULT },
                        [SIGTRAP] = { NSIGTRAP, SIL_FAULT },
-#if defined(SIGMET) && defined(NSIGEMT)
+#if defined(SIGEMT) && defined(NSIGEMT)
                        [SIGEMT]  = { NSIGEMT,  SIL_FAULT },
 #endif
                        [SIGCHLD] = { NSIGCHLD, SIL_CHLD },