diff options
Diffstat (limited to 'include/asm-sh/system.h')
-rw-r--r-- | include/asm-sh/system.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h index 4a6a19f4f8a4..e7e96ee0c8a5 100644 --- a/include/asm-sh/system.h +++ b/include/asm-sh/system.h | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/irqflags.h> | 9 | #include <linux/irqflags.h> |
10 | #include <linux/compiler.h> | 10 | #include <linux/compiler.h> |
11 | #include <asm/types.h> | 11 | #include <asm/types.h> |
12 | #include <asm/ptrace.h> | ||
12 | 13 | ||
13 | /* | 14 | /* |
14 | * switch_to() should switch tasks to task nr n, first | 15 | * switch_to() should switch tasks to task nr n, first |
@@ -81,16 +82,6 @@ static inline void sched_cacheflush(void) | |||
81 | } | 82 | } |
82 | #endif | 83 | #endif |
83 | 84 | ||
84 | static inline unsigned long tas(volatile int *m) | ||
85 | { | ||
86 | unsigned long retval; | ||
87 | |||
88 | __asm__ __volatile__ ("tas.b @%1\n\t" | ||
89 | "movt %0" | ||
90 | : "=r" (retval): "r" (m): "t", "memory"); | ||
91 | return retval; | ||
92 | } | ||
93 | |||
94 | /* | 85 | /* |
95 | * A brief note on ctrl_barrier(), the control register write barrier. | 86 | * A brief note on ctrl_barrier(), the control register write barrier. |
96 | * | 87 | * |
@@ -255,6 +246,8 @@ static inline unsigned long __cmpxchg(volatile void * ptr, unsigned long old, | |||
255 | (unsigned long)_n_, sizeof(*(ptr))); \ | 246 | (unsigned long)_n_, sizeof(*(ptr))); \ |
256 | }) | 247 | }) |
257 | 248 | ||
249 | extern void die(const char *str, struct pt_regs *regs, long err) __attribute__ ((noreturn)); | ||
250 | |||
258 | extern void *set_exception_table_vec(unsigned int vec, void *handler); | 251 | extern void *set_exception_table_vec(unsigned int vec, void *handler); |
259 | 252 | ||
260 | static inline void *set_exception_table_evt(unsigned int evt, void *handler) | 253 | static inline void *set_exception_table_evt(unsigned int evt, void *handler) |