Merge ../linux-2.6

25cd6aa0 · Paul Mackerras · b11fa580 · 67daf5f1 · 25cd6aa0 · 25cd6aa0
隐藏空白更改
内联并排

Showing with 3 addition and 3 deletion

fs/ufs/util.h fs/ufs/util.h +2 -2

include/linux/auxvec.h include/linux/auxvec.h +1 -1

未找到文件。
--- 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)-> \

--- 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 */