git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arc-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
[sfrench/cifs-2.6.git]
/
arch
/
arc
/
include
/
asm
/
atomic.h
diff --git
a/arch/arc/include/asm/atomic.h
b/arch/arc/include/asm/atomic.h
index 173f303a868f20854cbdcc598cf991e4f6d6d0e5..067551b6920af99fe733f1f13d4aee8b1903a77b 100644
(file)
--- a/
arch/arc/include/asm/atomic.h
+++ b/
arch/arc/include/asm/atomic.h
@@
-9,8
+9,6
@@
#ifndef _ASM_ARC_ATOMIC_H
#define _ASM_ARC_ATOMIC_H
-#ifdef __KERNEL__
-
#ifndef __ASSEMBLY__
#include <linux/types.h>
@@
-170,5
+168,3
@@
ATOMIC_OP(and, &=, and)
#endif
#endif
-
-#endif