2 files changed, 4 insertions, 26 deletions
diff --git a/include/asm-v850/bug.h b/include/asm-v850/bug.h
index c778916bf7f2..b0ed2d35f3e8 100644
--- a/include/asm-v850/bug.h
+++ b/include/asm-v850/bug.h
@@ -14,9 +14,12 @@
 #ifndef __V850_BUG_H__
 #define __V850_BUG_H__
+#ifdef CONFIG_BUG
 extern void __bug (void) __attribute__ ((noreturn));
 #define BUG()           __bug()
 #define HAVE_ARCH_BUG
+#endif
 #include <asm-generic/bug.h>
 #endif /* __V850_BUG_H__ */
diff --git a/include/asm-v850/signal.h b/include/asm-v850/signal.h
index 407db875899c..cb52caa69925 100644
--- a/include/asm-v850/signal.h
+++ b/include/asm-v850/signal.h
@@ -110,32 +110,7 @@ typedef unsigned long sigset_t;
 #define MINSIGSTKSZ     2048
 #define SIGSTKSZ        8192
+#include <asm-generic/signal.h>
-#ifdef __KERNEL__
-/*
- * These values of sa_flags are used only by the kernel as part of the
- * irq handling routines.
- *
- * SA_INTERRUPT is also used by the irq handling routines.
- * SA_SHIRQ is for shared interrupt support on PCI and EISA.
- */
-#define SA_PROBE                SA_ONESHOT
-#define SA_SAMPLE_RANDOM        SA_RESTART
-#define SA_SHIRQ                0x04000000
-#endif /* __KERNEL__ */
-#define SIG_BLOCK          0    /* for blocking signals */
-#define SIG_UNBLOCK        1    /* for unblocking signals */
-#define SIG_SETMASK        2    /* for setting the signal mask */
-/* Type of a signal handler.  */
-typedef void (*__sighandler_t)(int);
-#define SIG_DFL ((__sighandler_t)0)     /* default signal handling */
-#define SIG_IGN ((__sighandler_t)1)     /* ignore signal */
-#define SIG_ERR ((__sighandler_t)-1)    /* error return from signal */
 #ifdef __KERNEL__

diff --git a/include/asm-v850/bug.h b/include/asm-v850/bug.h index c778916bf7f2..b0ed2d35f3e8 100644 --- a/include/asm-v850/bug.h +++ b/include/asm-v850/bug.h
@@ -14,9 +14,12 @@
14	#ifndef __V850_BUG_H__	14	#ifndef __V850_BUG_H__
15	#define __V850_BUG_H__	15	#define __V850_BUG_H__
16		16
		17	#ifdef CONFIG_BUG
17	extern void __bug (void) __attribute__ ((noreturn));	18	extern void __bug (void) __attribute__ ((noreturn));
18	#define BUG() __bug()	19	#define BUG() __bug()
19	#define HAVE_ARCH_BUG	20	#define HAVE_ARCH_BUG
		21	#endif
		22
20	#include <asm-generic/bug.h>	23	#include <asm-generic/bug.h>
21		24
22	#endif /* __V850_BUG_H__ */	25	#endif /* __V850_BUG_H__ */


diff --git a/include/asm-v850/signal.h b/include/asm-v850/signal.h index 407db875899c..cb52caa69925 100644 --- a/include/asm-v850/signal.h +++ b/include/asm-v850/signal.h
@@ -110,32 +110,7 @@ typedef unsigned long sigset_t;
110	#define MINSIGSTKSZ 2048	110	#define MINSIGSTKSZ 2048
111	#define SIGSTKSZ 8192	111	#define SIGSTKSZ 8192
112		112
113		113	#include <asm-generic/signal.h>
114	#ifdef __KERNEL__
115	/*
116	* These values of sa_flags are used only by the kernel as part of the
117	* irq handling routines.
118	*
119	* SA_INTERRUPT is also used by the irq handling routines.
120	* SA_SHIRQ is for shared interrupt support on PCI and EISA.
121	*/
122	#define SA_PROBE SA_ONESHOT
123	#define SA_SAMPLE_RANDOM SA_RESTART
124	#define SA_SHIRQ 0x04000000
125	#endif /* __KERNEL__ */
126
127
128	#define SIG_BLOCK 0 /* for blocking signals */
129	#define SIG_UNBLOCK 1 /* for unblocking signals */
130	#define SIG_SETMASK 2 /* for setting the signal mask */
131
132	/* Type of a signal handler. */
133	typedef void (*__sighandler_t)(int);
134
135	#define SIG_DFL ((__sighandler_t)0) /* default signal handling */
136	#define SIG_IGN ((__sighandler_t)1) /* ignore signal */
137	#define SIG_ERR ((__sighandler_t)-1) /* error return from signal */
138
139		114
140	#ifdef __KERNEL__	115	#ifdef __KERNEL__
141		116