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/rcuclassic.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/rcuclassic.h')
| -rw-r--r-- | include/linux/rcuclassic.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/rcuclassic.h b/include/linux/rcuclassic.h index b3dccd68629e..b3aa05baab8a 100644 --- a/include/linux/rcuclassic.h +++ b/include/linux/rcuclassic.h | |||
| @@ -33,8 +33,6 @@ | |||
| 33 | #ifndef __LINUX_RCUCLASSIC_H | 33 | #ifndef __LINUX_RCUCLASSIC_H |
| 34 | #define __LINUX_RCUCLASSIC_H | 34 | #define __LINUX_RCUCLASSIC_H |
| 35 | 35 | ||
| 36 | #ifdef __KERNEL__ | ||
| 37 | |||
| 38 | #include <linux/cache.h> | 36 | #include <linux/cache.h> |
| 39 | #include <linux/spinlock.h> | 37 | #include <linux/spinlock.h> |
| 40 | #include <linux/threads.h> | 38 | #include <linux/threads.h> |
| @@ -163,5 +161,4 @@ extern long rcu_batches_completed_bh(void); | |||
| 163 | #define rcu_enter_nohz() do { } while (0) | 161 | #define rcu_enter_nohz() do { } while (0) |
| 164 | #define rcu_exit_nohz() do { } while (0) | 162 | #define rcu_exit_nohz() do { } while (0) |
| 165 | 163 | ||
| 166 | #endif /* __KERNEL__ */ | ||
| 167 | #endif /* __LINUX_RCUCLASSIC_H */ | 164 | #endif /* __LINUX_RCUCLASSIC_H */ |