| commit | 60063497a95e716c9a689af3be2687d261f115b4 | [log] [tgz] |
|---|---|---|
| author | Arun Sharma <[email protected]> | Tue Jul 26 16:09:06 2011 -0700 |
| committer | Linus Torvalds <[email protected]> | Tue Jul 26 16:49:47 2011 -0700 |
| tree | 6ce0d68db76982c53df46aee5f29f944ebf2c320 | |
| parent | 148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed [diff] [blame] |
atomic: use <linux/atomic.h> This allows us to move duplicated code in <asm/atomic.h> (atomic_inc_not_zero() for now) to <linux/atomic.h> Signed-off-by: Arun Sharma <[email protected]> Reviewed-by: Eric Dumazet <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: David Miller <[email protected]> Cc: Eric Dumazet <[email protected]> Acked-by: Mike Frysinger <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 1ab1aec..3bb6fa0 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h
@@ -4,7 +4,7 @@ #ifndef __NET_NET_NAMESPACE_H #define __NET_NET_NAMESPACE_H -#include <asm/atomic.h> +#include <linux/atomic.h> #include <linux/workqueue.h> #include <linux/list.h> #include <linux/sysctl.h>