diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-01-13 17:15:28 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-13 17:15:28 -0500 |
| commit | 25cd6aa0aa059b48cdcef2a00981b14fafd5161a (patch) | |
| tree | 7f7469861c44889ed97f81afeda9a9d08afa0e50 | |
| parent | b11fa580ac06b34944a2b46a44ebce2c284e1a76 (diff) | |
| parent | 67daf5f11f06b9b15f8320de1d237ccc2e74fe43 (diff) | |
Merge ../linux-2.6
| -rw-r--r-- | fs/ufs/util.h | 4 | ||||
| -rw-r--r-- | include/linux/auxvec.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/ufs/util.h b/fs/ufs/util.h index b2640076679a..e45ad5379872 100644 --- a/fs/ufs/util.h +++ b/fs/ufs/util.h | |||
| @@ -255,8 +255,8 @@ extern void _ubh_memcpyubh_(struct ufs_sb_private_info *, struct ufs_buffer_head | |||
| 255 | ((struct ufs_super_block_first *)((ubh)->bh[0]->b_data)) | 255 | ((struct ufs_super_block_first *)((ubh)->bh[0]->b_data)) |
| 256 | 256 | ||
| 257 | #define ubh_get_usb_second(ubh) \ | 257 | #define ubh_get_usb_second(ubh) \ |
| 258 | ((struct ufs_super_block_second *)(ubh)-> \ | 258 | ((struct ufs_super_block_second *)((ubh)->\ |
| 259 | bh[UFS_SECTOR_SIZE >> uspi->s_fshift]->b_data + (UFS_SECTOR_SIZE & ~uspi->s_fmask)) | 259 | bh[UFS_SECTOR_SIZE >> uspi->s_fshift]->b_data + (UFS_SECTOR_SIZE & ~uspi->s_fmask))) |
| 260 | 260 | ||
| 261 | #define ubh_get_usb_third(ubh) \ | 261 | #define ubh_get_usb_third(ubh) \ |
| 262 | ((struct ufs_super_block_third *)((ubh)-> \ | 262 | ((struct ufs_super_block_third *)((ubh)-> \ |
diff --git a/include/linux/auxvec.h b/include/linux/auxvec.h index 9a7b374c9fb4..d2bc0d66e65d 100644 --- a/include/linux/auxvec.h +++ b/include/linux/auxvec.h | |||
| @@ -26,6 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | #define AT_SECURE 23 /* secure mode boolean */ | 27 | #define AT_SECURE 23 /* secure mode boolean */ |
| 28 | 28 | ||
| 29 | #define AT_VECTOR_SIZE 42 /* Size of auxiliary table. */ | 29 | #define AT_VECTOR_SIZE 44 /* Size of auxiliary table. */ |
| 30 | 30 | ||
| 31 | #endif /* _LINUX_AUXVEC_H */ | 31 | #endif /* _LINUX_AUXVEC_H */ |