diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:41:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:41:27 -0400 |
| commit | 429f731dea577bdd43693940cdca524135287e6a (patch) | |
| tree | 932337b7d23dd736612c6b6e6601c50bc24cfc5f /net | |
| parent | 85b375a613085b78531ec86369a51c2f3b922f95 (diff) | |
| parent | d2f5e80862d33a7746a40569840248a592dbc395 (diff) | |
Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
* 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
Deprecate the asm/semaphore.h files in feature-removal-schedule.
Convert asm/semaphore.h users to linux/semaphore.h
security: Remove unnecessary inclusions of asm/semaphore.h
lib: Remove unnecessary inclusions of asm/semaphore.h
kernel: Remove unnecessary inclusions of asm/semaphore.h
include: Remove unnecessary inclusions of asm/semaphore.h
fs: Remove unnecessary inclusions of asm/semaphore.h
drivers: Remove unnecessary inclusions of asm/semaphore.h
net: Remove unnecessary inclusions of asm/semaphore.h
arch: Remove unnecessary inclusions of asm/semaphore.h
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/flow.c | 1 | ||||
| -rw-r--r-- | net/dccp/proto.c | 1 | ||||
| -rw-r--r-- | net/ipv4/ipcomp.c | 1 | ||||
| -rw-r--r-- | net/ipv6/ipcomp6.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/net/core/flow.c b/net/core/flow.c index a77531c139b7..19991175fdeb 100644 --- a/net/core/flow.c +++ b/net/core/flow.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/mutex.h> | 23 | #include <linux/mutex.h> |
| 24 | #include <net/flow.h> | 24 | #include <net/flow.h> |
| 25 | #include <asm/atomic.h> | 25 | #include <asm/atomic.h> |
| 26 | #include <asm/semaphore.h> | ||
| 27 | #include <linux/security.h> | 26 | #include <linux/security.h> |
| 28 | 27 | ||
| 29 | struct flow_cache_entry { | 28 | struct flow_cache_entry { |
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index a4c1b36f4bc7..9dfe2470962c 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <net/xfrm.h> | 27 | #include <net/xfrm.h> |
| 28 | 28 | ||
| 29 | #include <asm/ioctls.h> | 29 | #include <asm/ioctls.h> |
| 30 | #include <asm/semaphore.h> | ||
| 31 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
| 32 | #include <linux/timer.h> | 31 | #include <linux/timer.h> |
| 33 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c index fb53ddfea5b5..a75807b971b3 100644 --- a/net/ipv4/ipcomp.c +++ b/net/ipv4/ipcomp.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * - Adaptive compression. | 14 | * - Adaptive compression. |
| 15 | */ | 15 | */ |
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <asm/semaphore.h> | ||
| 18 | #include <linux/crypto.h> | 17 | #include <linux/crypto.h> |
| 19 | #include <linux/err.h> | 18 | #include <linux/err.h> |
| 20 | #include <linux/pfkeyv2.h> | 19 | #include <linux/pfkeyv2.h> |
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c index e3dcfa2f436b..ee6de425ce6b 100644 --- a/net/ipv6/ipcomp6.c +++ b/net/ipv6/ipcomp6.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <net/ip.h> | 34 | #include <net/ip.h> |
| 35 | #include <net/xfrm.h> | 35 | #include <net/xfrm.h> |
| 36 | #include <net/ipcomp.h> | 36 | #include <net/ipcomp.h> |
| 37 | #include <asm/semaphore.h> | ||
| 38 | #include <linux/crypto.h> | 37 | #include <linux/crypto.h> |
| 39 | #include <linux/err.h> | 38 | #include <linux/err.h> |
| 40 | #include <linux/pfkeyv2.h> | 39 | #include <linux/pfkeyv2.h> |