diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-05 09:06:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-05 09:06:44 -0700 |
| commit | 69148aaea563f4ace2df24afd0a2a463c4f6da63 (patch) | |
| tree | ef74df43784f7f1c120a8704775e45a2b61e52a1 /include | |
| parent | c349aea64870dce5623a54ce0e6fd4c5b575add9 (diff) | |
| parent | 967a352beac3b1af04747a6d0fbbdbba827af68f (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-alpha/sysinfo.h | 1 | ||||
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-alpha/sysinfo.h b/include/asm-alpha/sysinfo.h index 1c65a021ac3b..086aba284df2 100644 --- a/include/asm-alpha/sysinfo.h +++ b/include/asm-alpha/sysinfo.h @@ -18,6 +18,7 @@ #define SSI_IEEE_FP_CONTROL 14 #define SSI_IEEE_STATE_AT_SIGNAL 15 #define SSI_IEEE_IGNORE_STATE_AT_SIGNAL 16 +#define SSI_IEEE_RAISE_EXCEPTION 1001 /* linux specific */ #define SSIN_UACPROC 6 diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 49ff023fa2da..bb340cb5cb03 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -80,5 +80,5 @@ #define LOCK_TEXT \ VMLINUX_SYMBOL(__lock_text_start) = .; \ - *(.lock.text) \ + *(.spinlock.text) \ VMLINUX_SYMBOL(__lock_text_end) = .; |