diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/rwsem.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/rwsem.h')
| -rw-r--r-- | include/linux/rwsem.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h index 7b524b4109a0..efd348fe8ca7 100644 --- a/include/linux/rwsem.h +++ b/include/linux/rwsem.h | |||
| @@ -9,8 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 11 | 11 | ||
| 12 | #ifdef __KERNEL__ | ||
| 13 | |||
| 14 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 15 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 16 | #include <asm/system.h> | 14 | #include <asm/system.h> |
| @@ -90,5 +88,4 @@ extern void up_read_non_owner(struct rw_semaphore *sem); | |||
| 90 | # define up_read_non_owner(sem) up_read(sem) | 88 | # define up_read_non_owner(sem) up_read(sem) |
| 91 | #endif | 89 | #endif |
| 92 | 90 | ||
| 93 | #endif /* __KERNEL__ */ | ||
| 94 | #endif /* _LINUX_RWSEM_H */ | 91 | #endif /* _LINUX_RWSEM_H */ |