summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-01-14 09:15:28 +1100
committerPaul Mackerras <paulus@samba.org>2006-01-14 09:15:28 +1100
commit25cd6aa0aa059b48cdcef2a00981b14fafd5161a (patch)
tree7f7469861c44889ed97f81afeda9a9d08afa0e50
parentb11fa580ac06b34944a2b46a44ebce2c284e1a76 (diff)
parent67daf5f11f06b9b15f8320de1d237ccc2e74fe43 (diff)
downloadop-kernel-dev-25cd6aa0aa059b48cdcef2a00981b14fafd5161a.zip
op-kernel-dev-25cd6aa0aa059b48cdcef2a00981b14fafd5161a.tar.gz
Merge ../linux-2.6
-rw-r--r--fs/ufs/util.h4
-rw-r--r--include/linux/auxvec.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/ufs/util.h b/fs/ufs/util.h
index b264007..e45ad53 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
((struct ufs_super_block_first *)((ubh)->bh[0]->b_data))
#define ubh_get_usb_second(ubh) \
- ((struct ufs_super_block_second *)(ubh)-> \
- bh[UFS_SECTOR_SIZE >> uspi->s_fshift]->b_data + (UFS_SECTOR_SIZE & ~uspi->s_fmask))
+ ((struct ufs_super_block_second *)((ubh)->\
+ bh[UFS_SECTOR_SIZE >> uspi->s_fshift]->b_data + (UFS_SECTOR_SIZE & ~uspi->s_fmask)))
#define ubh_get_usb_third(ubh) \
((struct ufs_super_block_third *)((ubh)-> \
diff --git a/include/linux/auxvec.h b/include/linux/auxvec.h
index 9a7b374..d2bc0d6 100644
--- a/include/linux/auxvec.h
+++ b/include/linux/auxvec.h
@@ -26,6 +26,6 @@
#define AT_SECURE 23 /* secure mode boolean */
-#define AT_VECTOR_SIZE 42 /* Size of auxiliary table. */
+#define AT_VECTOR_SIZE 44 /* Size of auxiliary table. */
#endif /* _LINUX_AUXVEC_H */
OpenPOWER on IntegriCloud