---

yaml --- r: 356653 b: refs/heads/master c: ca86b5d h: refs/heads/master i: 356651: 13e9a90 v: v3
git-mirror · Feb 3, 2013 · aa28c2a · aa28c2a
1 parent 7c017f6
commit aa28c2a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d94b9e2f354f79461aa674e75b0926d0e768db6
+refs/heads/master: ca86b5dce213f52c7538932740f83cafb2c34547
diff --git a/trunk/include/linux/signal.h b/trunk/include/linux/signal.h
@@ -279,10 +279,28 @@ struct old_sigaction {
 };
 #endif
 
+struct ksignal {
+	struct k_sigaction ka;
+	siginfo_t info;
+	int sig;
+};
+
 extern int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, struct pt_regs *regs, void *cookie);
 extern void signal_delivered(int sig, siginfo_t *info, struct k_sigaction *ka, struct pt_regs *regs, int stepping);
 extern void exit_signals(struct task_struct *tsk);
 
+/*
+ * Eventually that'll replace get_signal_to_deliver(); macro for now,
+ * to avoid nastiness with include order.
+ */
+#define get_signal(ksig)					\
+({								\
+	struct ksignal *p = (ksig);				\
+	p->sig = get_signal_to_deliver(&p->info, &p->ka,	\
+					signal_pt_regs(), NULL);\
+	p->sig > 0;						\
+})
+
 extern struct kmem_cache *sighand_cachep;
 
 int unhandled_signal(struct task_struct *tsk, int sig);