diff options
author | Sebastian Siewior <bigeasy@linutronix.de> | 2008-05-13 12:52:44 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2008-07-23 01:11:28 -0400 |
commit | 6dbeb456baaba05d60e7ca8213da26142062408a (patch) | |
tree | 19a5c33acd7e10690ab2bcc6ad6f852d26d87b6a /include/asm-m68knommu/system.h | |
parent | e872504b311cec52f7a316a0037fb959080dbea0 (diff) |
m68knommu: add read_barrier_depends() and irqs_disabled_flags()
/home/bigeasy/git/linux-2.6-ftrace/kernel/trace/trace.c: In function 'tracing_generic_entry_update':
/home/bigeasy/git/linux-2.6-ftrace/kernel/trace/trace.c:802: error: implicit declaration of function 'irqs_disabled_flags'
make[3]: *** [kernel/trace/trace.o] Error 1
/home/bigeasy/git/linux-2.6-ftrace/kernel/trace/ftrace.c: In function 'ftrace_list_func':
/home/bigeasy/git/linux-2.6-ftrace/kernel/trace/ftrace.c:61: error: implicit declaration of function 'read_barrier_depends'
Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'include/asm-m68knommu/system.h')
-rw-r--r-- | include/asm-m68knommu/system.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/asm-m68knommu/system.h b/include/asm-m68knommu/system.h index 64c64432bbb8..40f49de69821 100644 --- a/include/asm-m68knommu/system.h +++ b/include/asm-m68knommu/system.h | |||
@@ -118,6 +118,8 @@ asmlinkage void resume(void); | |||
118 | #define smp_read_barrier_depends() do { } while(0) | 118 | #define smp_read_barrier_depends() do { } while(0) |
119 | #endif | 119 | #endif |
120 | 120 | ||
121 | #define read_barrier_depends() ((void)0) | ||
122 | |||
121 | #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) | 123 | #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) |
122 | 124 | ||
123 | struct __xchg_dummy { unsigned long a[100]; }; | 125 | struct __xchg_dummy { unsigned long a[100]; }; |
@@ -310,4 +312,13 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz | |||
310 | #endif | 312 | #endif |
311 | #define arch_align_stack(x) (x) | 313 | #define arch_align_stack(x) (x) |
312 | 314 | ||
315 | |||
316 | static inline int irqs_disabled_flags(unsigned long flags) | ||
317 | { | ||
318 | if (flags & 0x0700) | ||
319 | return 0; | ||
320 | else | ||
321 | return 1; | ||
322 | } | ||
323 | |||
313 | #endif /* _M68KNOMMU_SYSTEM_H */ | 324 | #endif /* _M68KNOMMU_SYSTEM_H */ |