---

yaml --- r: 105609 b: refs/heads/master c: 6dbeb45 h: refs/heads/master i: 105607: 1e10ba7 v: v3
git-mirror · Jul 23, 2008 · 617ef60 · 617ef60
1 parent 82213d3
commit 617ef60
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git 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
@@ -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 */