From dea880451ed8017cb3de015ec3e4cc3e3ea39f98 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 18 Aug 2008 00:12:41 -0400
Subject: [PATCH] --- yaml --- r: 117423 b: refs/heads/master c:
 2e074004c6b71a93c8e08c0dd5e3cec0b92ad0e5 h: refs/heads/master i:   117421:
 5639fcbd1448a20e8483a8a4f7336e4b17a12bbf   117419:
 00039b34bebaff0b640a88b85009a02077710159   117415:
 5fdd9fe8692de5fa140cfa4f07c385515b301794   117407:
 b627579d0b06803aa15e7b16c6686d3fac8faab6 v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/powerpc/include/asm/signal.h |  1 -
 trunk/arch/powerpc/kernel/signal.h      |  2 ++
 trunk/arch/um/include/asm/signal.h      | 29 -------------------------
 4 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 trunk/arch/um/include/asm/signal.h

diff --git a/[refs] b/[refs]
index 9c8a413164b9..bc6fc3df6efb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3be311e324087d94050010b97821b9d77a45e92f
+refs/heads/master: 2e074004c6b71a93c8e08c0dd5e3cec0b92ad0e5
diff --git a/trunk/arch/powerpc/include/asm/signal.h b/trunk/arch/powerpc/include/asm/signal.h
index a7360cdd99eb..69f709d8e8e7 100644
--- a/trunk/arch/powerpc/include/asm/signal.h
+++ b/trunk/arch/powerpc/include/asm/signal.h
@@ -122,7 +122,6 @@ typedef struct sigaltstack {
 
 #ifdef __KERNEL__
 struct pt_regs;
-extern void do_signal(struct pt_regs *regs, unsigned long thread_info_flags);
 #define ptrace_signal_deliver(regs, cookie) do { } while (0)
 #endif /* __KERNEL__ */
 
diff --git a/trunk/arch/powerpc/kernel/signal.h b/trunk/arch/powerpc/kernel/signal.h
index 28f4b9f5fe5e..b427bf8e1d8f 100644
--- a/trunk/arch/powerpc/kernel/signal.h
+++ b/trunk/arch/powerpc/kernel/signal.h
@@ -12,6 +12,8 @@
 
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
 
+extern void do_signal(struct pt_regs *regs, unsigned long thread_info_flags);
+
 extern void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
 				  size_t frame_size);
 extern void restore_sigmask(sigset_t *set);
diff --git a/trunk/arch/um/include/asm/signal.h b/trunk/arch/um/include/asm/signal.h
deleted file mode 100644
index 52ed92cbce4c..000000000000
--- a/trunk/arch/um/include/asm/signal.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* 
- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
- * Licensed under the GPL
- */
-
-#ifndef __UM_SIGNAL_H
-#define __UM_SIGNAL_H
-
-/* Need to kill the do_signal() declaration in the i386 signal.h */
-
-#define do_signal do_signal_renamed
-#include "asm/arch/signal.h"
-#undef do_signal
-#undef ptrace_signal_deliver
-
-#define ptrace_signal_deliver(regs, cookie) do {} while(0)
-
-#endif
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */