aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-07-26 10:22:36 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-26 10:22:36 -0400
commitdab5025ca2f704ea6629121446d62e3043b210e9 (patch)
treee00007494171934393ab500bce506b03777486c0 /include
parent761a126017e3f001d3f5a574787aa232a9cd5bb5 (diff)
parent6bc063d414a815937fc81449fa9ffe8d3a4cdf22 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SCSI] esp: Fix build. [SPARC]: Fix SA_STATIC_ALLOC value. [SPARC64]: Explicitly print return PC when the kernel fault PC is bogus.
Diffstat (limited to 'include')
-rw-r--r--include/asm-sparc/signal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/signal.h b/include/asm-sparc/signal.h
index 0ae5084c427b..d03a21c97abb 100644
--- a/include/asm-sparc/signal.h
+++ b/include/asm-sparc/signal.h
@@ -168,7 +168,7 @@ struct sigstack {
168 * statically allocated data.. which is NOT GOOD. 168 * statically allocated data.. which is NOT GOOD.
169 * 169 *
170 */ 170 */
171#define SA_STATIC_ALLOC 0x80 171#define SA_STATIC_ALLOC 0x8000
172#endif 172#endif
173 173
174#include <asm-generic/signal.h> 174#include <asm-generic/signal.h>