diff options
| author | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
| commit | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (patch) | |
| tree | d5fdf52a2d0731f7fab0ce0ed394faac50b04fbc /net/rds/rds.h | |
| parent | b8bb76713ec50df2f11efee386e16f93d51e1076 (diff) | |
| parent | 8fe74cf053de7ad2124a894996f84fa890a81093 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge
Diffstat (limited to 'net/rds/rds.h')
| -rw-r--r-- | net/rds/rds.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/rds/rds.h b/net/rds/rds.h index 060400704979..619f0a30a4e5 100644 --- a/net/rds/rds.h +++ b/net/rds/rds.h | |||
| @@ -28,6 +28,10 @@ | |||
| 28 | */ | 28 | */ |
| 29 | #define RDS_PORT 18634 | 29 | #define RDS_PORT 18634 |
| 30 | 30 | ||
| 31 | #ifdef ATOMIC64_INIT | ||
| 32 | #define KERNEL_HAS_ATOMIC64 | ||
| 33 | #endif | ||
| 34 | |||
| 31 | #ifdef DEBUG | 35 | #ifdef DEBUG |
| 32 | #define rdsdebug(fmt, args...) pr_debug("%s(): " fmt, __func__ , ##args) | 36 | #define rdsdebug(fmt, args...) pr_debug("%s(): " fmt, __func__ , ##args) |
| 33 | #else | 37 | #else |