summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-12-06 20:40:28 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 08:39:45 -0800
commit4b358e22064b4551aa8b4dcfe3efe70a13548676 (patch)
tree77c630d072bc8413ce9cbfa1e9a3f5df061f6fca
parentccdea2f88b5689f0fd29c3804be43a3acf0311e3 (diff)
downloadlinux-3.10-4b358e22064b4551aa8b4dcfe3efe70a13548676.tar.gz
linux-3.10-4b358e22064b4551aa8b4dcfe3efe70a13548676.tar.bz2
linux-3.10-4b358e22064b4551aa8b4dcfe3efe70a13548676.zip
[PATCH] cleanup include/asm-generic/atomic.h
cleanup asm-generic/atomic.h - no longer a userspace header - remove the unneeded #include <asm/types.h> - #else/#endif comments [akpm@osdl.org: fix arm build] Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/asm-generic/Kbuild1
-rw-r--r--include/asm-generic/atomic.h7
2 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
index 3c06be38170..fa14f8cd30c 100644
--- a/include/asm-generic/Kbuild
+++ b/include/asm-generic/Kbuild
@@ -1,4 +1,3 @@
-header-y += atomic.h
header-y += errno-base.h
header-y += errno.h
header-y += fcntl.h
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
index 42a95d9a064..b7e4a0467cb 100644
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
@@ -66,7 +66,7 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
atomic64_sub(i, v);
}
-#else
+#else /* BITS_PER_LONG == 64 */
typedef atomic_t atomic_long_t;
@@ -113,5 +113,6 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
atomic_sub(i, v);
}
-#endif
-#endif
+#endif /* BITS_PER_LONG == 64 */
+
+#endif /* _ASM_GENERIC_ATOMIC_H */