diff --git a/[refs] b/[refs] index fdc041aaac1c..47980c2f4152 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75043cb5b386e5a01fd03b88f647dd992de02f97 +refs/heads/master: c6b56949de86694d837750a0a89c766b9871e81c diff --git a/trunk/fs/qnx4/dir.c b/trunk/fs/qnx4/dir.c index 7a8f5595c26f..cd66147cca04 100644 --- a/trunk/fs/qnx4/dir.c +++ b/trunk/fs/qnx4/dir.c @@ -61,7 +61,7 @@ static int qnx4_readdir(struct file *filp, void *dirent, filldir_t filldir) ino = blknum * QNX4_INODES_PER_BLOCK + ix - 1; else { le = (struct qnx4_link_info*)de; - ino = ( le32_to_cpu(le->dl_inode_blk) - 1 ) * + ino = ( le->dl_inode_blk - 1 ) * QNX4_INODES_PER_BLOCK + le->dl_inode_ndx; } diff --git a/trunk/fs/qnx4/inode.c b/trunk/fs/qnx4/inode.c index b79162a35478..aa92d6b76a9a 100644 --- a/trunk/fs/qnx4/inode.c +++ b/trunk/fs/qnx4/inode.c @@ -236,7 +236,7 @@ unsigned long qnx4_block_map( struct inode *inode, long iblock ) struct buffer_head *bh = NULL; struct qnx4_xblk *xblk = NULL; struct qnx4_inode_entry *qnx4_inode = qnx4_raw_inode(inode); - u16 nxtnt = le16_to_cpu(qnx4_inode->di_num_xtnts); + qnx4_nxtnt_t nxtnt = le16_to_cpu(qnx4_inode->di_num_xtnts); if ( iblock < le32_to_cpu(qnx4_inode->di_first_xtnt.xtnt_size) ) { // iblock is in the first extent. This is easy. @@ -372,7 +372,7 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent) printk("qnx4: unable to read the superblock\n"); goto outnobh; } - if ( le32_to_cpup((__le32*) bh->b_data) != QNX4_SUPER_MAGIC ) { + if ( le32_to_cpu( *(__u32*)bh->b_data ) != QNX4_SUPER_MAGIC ) { if (!silent) printk("qnx4: wrong fsid in superblock.\n"); goto out; diff --git a/trunk/include/asm-arm/arch-ixp2000/io.h b/trunk/include/asm-arm/arch-ixp2000/io.h index 083462668e18..e5c742bc2330 100644 --- a/trunk/include/asm-arm/arch-ixp2000/io.h +++ b/trunk/include/asm-arm/arch-ixp2000/io.h @@ -27,8 +27,8 @@ * since that isn't available on the A? revisions we just keep doing * things manually. */ -#define alignb(addr) (void __iomem *)((unsigned long)addr ^ 3) -#define alignw(addr) (void __iomem *)((unsigned long)addr ^ 2) +#define alignb(addr) (void __iomem *)((unsigned long)(addr) ^ 3) +#define alignw(addr) (void __iomem *)((unsigned long)(addr) ^ 2) #define outb(v,p) __raw_writeb((v),alignb(___io(p))) #define outw(v,p) __raw_writew((v),alignw(___io(p))) diff --git a/trunk/include/asm-i386/string.h b/trunk/include/asm-i386/string.h index 02c8f5d22065..6a78ac58c194 100644 --- a/trunk/include/asm-i386/string.h +++ b/trunk/include/asm-i386/string.h @@ -116,8 +116,7 @@ __asm__ __volatile__( "orb $1,%%al\n" "3:" :"=a" (__res), "=&S" (d0), "=&D" (d1) - :"1" (cs),"2" (ct) - :"memory"); + :"1" (cs),"2" (ct)); return __res; } @@ -139,9 +138,8 @@ __asm__ __volatile__( "3:\tsbbl %%eax,%%eax\n\t" "orb $1,%%al\n" "4:" - :"=a" (__res), "=&S" (d0), "=&D" (d1), "=&c" (d2) - :"1" (cs),"2" (ct),"3" (count) - :"memory"); + :"=a" (__res), "=&S" (d0), "=&D" (d1), "=&c" (d2) + :"1" (cs),"2" (ct),"3" (count)); return __res; } @@ -160,9 +158,7 @@ __asm__ __volatile__( "movl $1,%1\n" "2:\tmovl %1,%0\n\t" "decl %0" - :"=a" (__res), "=&S" (d0) - :"1" (s),"0" (c) - :"memory"); + :"=a" (__res), "=&S" (d0) : "1" (s),"0" (c)); return __res; } @@ -179,9 +175,7 @@ __asm__ __volatile__( "leal -1(%%esi),%0\n" "2:\ttestb %%al,%%al\n\t" "jne 1b" - :"=g" (__res), "=&S" (d0), "=&a" (d1) - :"0" (0),"1" (s),"2" (c) - :"memory"); + :"=g" (__res), "=&S" (d0), "=&a" (d1) :"0" (0),"1" (s),"2" (c)); return __res; } @@ -195,9 +189,7 @@ __asm__ __volatile__( "scasb\n\t" "notl %0\n\t" "decl %0" - :"=c" (__res), "=&D" (d0) - :"1" (s),"a" (0), "0" (0xffffffffu) - :"memory"); + :"=c" (__res), "=&D" (d0) :"1" (s),"a" (0), "0" (0xffffffffu)); return __res; } @@ -341,9 +333,7 @@ __asm__ __volatile__( "je 1f\n\t" "movl $1,%0\n" "1:\tdecl %0" - :"=D" (__res), "=&c" (d0) - :"a" (c),"0" (cs),"1" (count) - :"memory"); + :"=D" (__res), "=&c" (d0) : "a" (c),"0" (cs),"1" (count)); return __res; } @@ -379,7 +369,7 @@ __asm__ __volatile__( "je 2f\n\t" "stosb\n" "2:" - :"=&c" (d0), "=&D" (d1) + : "=&c" (d0), "=&D" (d1) :"a" (c), "q" (count), "0" (count/4), "1" ((long) s) :"memory"); return (s); @@ -402,8 +392,7 @@ __asm__ __volatile__( "jne 1b\n" "3:\tsubl %2,%0" :"=a" (__res), "=&d" (d0) - :"c" (s),"1" (count) - :"memory"); + :"c" (s),"1" (count)); return __res; } /* end of additional stuff */ @@ -484,8 +473,7 @@ static inline void * memscan(void * addr, int c, size_t size) "dec %%edi\n" "1:" : "=D" (addr), "=c" (size) - : "0" (addr), "1" (size), "a" (c) - : "memory"); + : "0" (addr), "1" (size), "a" (c)); return addr; } diff --git a/trunk/include/linux/qnx4_fs.h b/trunk/include/linux/qnx4_fs.h index fc610bb0f733..22ba580b0ae8 100644 --- a/trunk/include/linux/qnx4_fs.h +++ b/trunk/include/linux/qnx4_fs.h @@ -46,11 +46,11 @@ struct qnx4_inode_entry { char di_fname[QNX4_SHORT_NAME_MAX]; qnx4_off_t di_size; qnx4_xtnt_t di_first_xtnt; - __le32 di_xblk; - __le32 di_ftime; - __le32 di_mtime; - __le32 di_atime; - __le32 di_ctime; + __u32 di_xblk; + __s32 di_ftime; + __s32 di_mtime; + __s32 di_atime; + __s32 di_ctime; qnx4_nxtnt_t di_num_xtnts; qnx4_mode_t di_mode; qnx4_muid_t di_uid; @@ -63,18 +63,18 @@ struct qnx4_inode_entry { struct qnx4_link_info { char dl_fname[QNX4_NAME_MAX]; - __le32 dl_inode_blk; + __u32 dl_inode_blk; __u8 dl_inode_ndx; __u8 dl_spare[10]; __u8 dl_status; }; struct qnx4_xblk { - __le32 xblk_next_xblk; - __le32 xblk_prev_xblk; + __u32 xblk_next_xblk; + __u32 xblk_prev_xblk; __u8 xblk_num_xtnts; __u8 xblk_spare[3]; - __le32 xblk_num_blocks; + __s32 xblk_num_blocks; qnx4_xtnt_t xblk_xtnts[QNX4_MAX_XTNTS_PER_XBLK]; char xblk_signature[8]; qnx4_xtnt_t xblk_first_xtnt; diff --git a/trunk/include/linux/qnxtypes.h b/trunk/include/linux/qnxtypes.h index a3eb1137857b..fb518e318c7c 100644 --- a/trunk/include/linux/qnxtypes.h +++ b/trunk/include/linux/qnxtypes.h @@ -12,18 +12,18 @@ #ifndef _QNX4TYPES_H #define _QNX4TYPES_H -typedef __le16 qnx4_nxtnt_t; +typedef __u16 qnx4_nxtnt_t; typedef __u8 qnx4_ftype_t; typedef struct { - __le32 xtnt_blk; - __le32 xtnt_size; + __u32 xtnt_blk; + __u32 xtnt_size; } qnx4_xtnt_t; -typedef __le16 qnx4_mode_t; -typedef __le16 qnx4_muid_t; -typedef __le16 qnx4_mgid_t; -typedef __le32 qnx4_off_t; -typedef __le16 qnx4_nlink_t; +typedef __u16 qnx4_mode_t; +typedef __u16 qnx4_muid_t; +typedef __u16 qnx4_mgid_t; +typedef __u32 qnx4_off_t; +typedef __u16 qnx4_nlink_t; #endif