2 files changed, 11 insertions, 20 deletions

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index a777d3761416..3401293359e8 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1992,19 +1992,19 @@ int __audit_signal_info(int sig, struct task_struct *t)
         extern uid_t audit_sig_uid;
         extern u32 audit_sig_sid;
 
-        if (audit_pid && t->tgid == audit_pid &&
-            (sig == SIGTERM || sig == SIGHUP || sig == SIGUSR1)) {
-                audit_sig_pid = tsk->pid;
-                if (ctx)
-                        audit_sig_uid = ctx->loginuid;
-                else
-                        audit_sig_uid = tsk->uid;
-                selinux_get_task_sid(tsk, &audit_sig_sid);
+        if (audit_pid && t->tgid == audit_pid) {
+                if (sig == SIGTERM || sig == SIGHUP || sig == SIGUSR1) {
+                        audit_sig_pid = tsk->pid;
+                        if (ctx)
+                                audit_sig_uid = ctx->loginuid;
+                        else
+                                audit_sig_uid = tsk->uid;
+                        selinux_get_task_sid(tsk, &audit_sig_sid);
+                }
+                if (!audit_signals || audit_dummy_context())
+                        return 0;
         }
 
-        if (!audit_signals) /* audit_context checked in wrapper */
-                return 0;
-
         /* optimize the common case by putting first signal recipient directly
          * in audit_context */
         if (!ctx->target_pid) {
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index c38272746887..5bfeaed7e487 100644
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -62,15 +62,6 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)
          */
         desc->chip->enable(irq);
 
-        /*
-         * Temporary hack to figure out more about the problem, which
-         * is causing the ancient network cards to die.
-         */
-        if (desc->handle_irq != handle_edge_irq) {
-                WARN_ON_ONCE(1);
-                return;
-        }
-
         if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
                 desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;