Skip to content

L
linux-davinci
Commit 25cd6aa0 authored by Paul Mackerras's avatar Paul Mackerras
Browse files
Options

Merge ../linux-2.6

parents b11fa580 67daf5f1
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
fs/ufs/util.h
View file @ 25cd6aa0
...@@ -255,8 +255,8 @@ extern void _ubh_memcpyubh_(struct ufs_sb_private_info *, struct ufs_buffer_head ...@@ -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
View file @ 25cd6aa0
...@@ -26,6 +26,6 @@ ...@@ -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 */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment