From 617ef605455d36bca75af6b2a84478eadb4e4083 Mon Sep 17 00:00:00 2001 From: Sebastian Siewior Date: Tue, 13 May 2008 18:52:44 +0200 Subject: [PATCH] --- yaml --- r: 105609 b: refs/heads/master c: 6dbeb456baaba05d60e7ca8213da26142062408a h: refs/heads/master i: 105607: 1e10ba775339e97d549150fb493557f65119011d v: v3 --- [refs] | 2 +- trunk/include/asm-m68knommu/system.h | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index dbfa513aa5d8..4b5fc8edcedd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e872504b311cec52f7a316a0037fb959080dbea0 +refs/heads/master: 6dbeb456baaba05d60e7ca8213da26142062408a diff --git a/trunk/include/asm-m68knommu/system.h b/trunk/include/asm-m68knommu/system.h index 64c64432bbb8..40f49de69821 100644 --- a/trunk/include/asm-m68knommu/system.h +++ b/trunk/include/asm-m68knommu/system.h @@ -118,6 +118,8 @@ asmlinkage void resume(void); #define smp_read_barrier_depends() do { } while(0) #endif +#define read_barrier_depends() ((void)0) + #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) struct __xchg_dummy { unsigned long a[100]; }; @@ -310,4 +312,13 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz #endif #define arch_align_stack(x) (x) + +static inline int irqs_disabled_flags(unsigned long flags) +{ + if (flags & 0x0700) + return 0; + else + return 1; +} + #endif /* _M68KNOMMU_SYSTEM_H */