diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /fs/xfs/linux-2.6/xfs_linux.h | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_linux.h')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_linux.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h index aa26ab906c88..028eb17ec2ed 100644 --- a/fs/xfs/linux-2.6/xfs_linux.h +++ b/fs/xfs/linux-2.6/xfs_linux.h | |||
| @@ -140,9 +140,7 @@ BUFFER_FNS(PrivateStart, unwritten); | |||
| 140 | #define current_pid() (current->pid) | 140 | #define current_pid() (current->pid) |
| 141 | #define current_fsuid(cred) (current->fsuid) | 141 | #define current_fsuid(cred) (current->fsuid) |
| 142 | #define current_fsgid(cred) (current->fsgid) | 142 | #define current_fsgid(cred) (current->fsgid) |
| 143 | #define current_set_flags(f) (current->flags |= (f)) | ||
| 144 | #define current_test_flags(f) (current->flags & (f)) | 143 | #define current_test_flags(f) (current->flags & (f)) |
| 145 | #define current_clear_flags(f) (current->flags & ~(f)) | ||
| 146 | #define current_set_flags_nested(sp, f) \ | 144 | #define current_set_flags_nested(sp, f) \ |
| 147 | (*(sp) = current->flags, current->flags |= (f)) | 145 | (*(sp) = current->flags, current->flags |= (f)) |
| 148 | #define current_clear_flags_nested(sp, f) \ | 146 | #define current_clear_flags_nested(sp, f) \ |