diff options
Diffstat (limited to 'include/asm-sh')
-rw-r--r-- | include/asm-sh/bug.h | 3 | ||||
-rw-r--r-- | include/asm-sh/checksum.h | 2 | ||||
-rw-r--r-- | include/asm-sh/signal.h | 14 |
3 files changed, 4 insertions, 15 deletions
diff --git a/include/asm-sh/bug.h b/include/asm-sh/bug.h index 70172217140f..70508a360cd6 100644 --- a/include/asm-sh/bug.h +++ b/include/asm-sh/bug.h | |||
@@ -3,6 +3,7 @@ | |||
3 | 3 | ||
4 | #include <linux/config.h> | 4 | #include <linux/config.h> |
5 | 5 | ||
6 | #ifdef CONFIG_BUG | ||
6 | /* | 7 | /* |
7 | * Tell the user there is some problem. | 8 | * Tell the user there is some problem. |
8 | */ | 9 | */ |
@@ -12,6 +13,8 @@ | |||
12 | } while (0) | 13 | } while (0) |
13 | 14 | ||
14 | #define HAVE_ARCH_BUG | 15 | #define HAVE_ARCH_BUG |
16 | #endif | ||
17 | |||
15 | #include <asm-generic/bug.h> | 18 | #include <asm-generic/bug.h> |
16 | 19 | ||
17 | #endif | 20 | #endif |
diff --git a/include/asm-sh/checksum.h b/include/asm-sh/checksum.h index 5113c7f8a739..5ebd0f24299e 100644 --- a/include/asm-sh/checksum.h +++ b/include/asm-sh/checksum.h | |||
@@ -42,7 +42,7 @@ asmlinkage unsigned int csum_partial_copy_generic(const unsigned char *src, unsi | |||
42 | * passed in an incorrect kernel address to one of these functions. | 42 | * passed in an incorrect kernel address to one of these functions. |
43 | * | 43 | * |
44 | * If you use these functions directly please don't forget the | 44 | * If you use these functions directly please don't forget the |
45 | * verify_area(). | 45 | * access_ok(). |
46 | */ | 46 | */ |
47 | static __inline__ | 47 | static __inline__ |
48 | unsigned int csum_partial_copy_nocheck (const unsigned char *src, unsigned char *dst, | 48 | unsigned int csum_partial_copy_nocheck (const unsigned char *src, unsigned char *dst, |
diff --git a/include/asm-sh/signal.h b/include/asm-sh/signal.h index 0a7ff717c245..29f1ac1bf4df 100644 --- a/include/asm-sh/signal.h +++ b/include/asm-sh/signal.h | |||
@@ -108,20 +108,6 @@ typedef unsigned long sigset_t; | |||
108 | #define MINSIGSTKSZ 2048 | 108 | #define MINSIGSTKSZ 2048 |
109 | #define SIGSTKSZ 8192 | 109 | #define SIGSTKSZ 8192 |
110 | 110 | ||
111 | #ifdef __KERNEL__ | ||
112 | |||
113 | /* | ||
114 | * These values of sa_flags are used only by the kernel as part of the | ||
115 | * irq handling routines. | ||
116 | * | ||
117 | * SA_INTERRUPT is also used by the irq handling routines. | ||
118 | * SA_SHIRQ is for shared interrupt support on PCI and EISA. | ||
119 | */ | ||
120 | #define SA_PROBE SA_ONESHOT | ||
121 | #define SA_SAMPLE_RANDOM SA_RESTART | ||
122 | #define SA_SHIRQ 0x04000000 | ||
123 | #endif | ||
124 | |||
125 | #define SIG_BLOCK 0 /* for blocking signals */ | 111 | #define SIG_BLOCK 0 /* for blocking signals */ |
126 | #define SIG_UNBLOCK 1 /* for unblocking signals */ | 112 | #define SIG_UNBLOCK 1 /* for unblocking signals */ |
127 | #define SIG_SETMASK 2 /* for setting the signal mask */ | 113 | #define SIG_SETMASK 2 /* for setting the signal mask */ |