Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25cd6aa0 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge ../linux-2.6

parents b11fa580 67daf5f1

fs/ufs/util.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -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))

	((struct ufs_super_block_first *)((ubh)->bh[0]->b_data))





#define ubh_get_usb_second(ubh) \

#define ubh_get_usb_second(ubh) \

	((struct ufs_super_block_second *)(ubh)-> \

	((struct ufs_super_block_second *)((ubh)->\

	bh[UFS_SECTOR_SIZE >> uspi->s_fshift]->b_data + (UFS_SECTOR_SIZE & ~uspi->s_fmask))

	bh[UFS_SECTOR_SIZE >> uspi->s_fshift]->b_data + (UFS_SECTOR_SIZE & ~uspi->s_fmask)))





#define ubh_get_usb_third(ubh) \

#define ubh_get_usb_third(ubh) \

	((struct ufs_super_block_third *)((ubh)-> \

	((struct ufs_super_block_third *)((ubh)-> \

include/linux/auxvec.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,6 +26,6 @@ 




#define AT_SECURE 23   /* secure mode boolean */

#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 */
 
#endif /* _LINUX_AUXVEC_H */