git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
system.h
diff --git
a/arch/arm/include/asm/system.h
b/arch/arm/include/asm/system.h
index
4ace45e
..
5f4f480
100644
(file)
--- a/
arch/arm/include/asm/system.h
+++ b/
arch/arm/include/asm/system.h
@@
-141,7
+141,7
@@
extern unsigned int user_debug;
#ifdef CONFIG_ARCH_HAS_BARRIERS
#include <mach/barriers.h>
#ifdef CONFIG_ARCH_HAS_BARRIERS
#include <mach/barriers.h>
-#elif
__LINUX_ARM_ARCH__ >= 7
|| defined(CONFIG_SMP)
+#elif
defined(CONFIG_ARM_DMA_MEM_BUFFERABLE)
|| defined(CONFIG_SMP)
#define mb() do { dsb(); outer_sync(); } while (0)
#define rmb() dmb()
#define wmb() mb()
#define mb() do { dsb(); outer_sync(); } while (0)
#define rmb() dmb()
#define wmb() mb()