5 files changed, 42 insertions, 30 deletions

diff --git a/fs/qnx4/dir.c b/fs/qnx4/dir.c
index cd66147cca04..7a8f5595c26f 100644
--- a/fs/qnx4/dir.c
+++ b/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 = ( le->dl_inode_blk - 1 ) *
+                                                ino = ( le32_to_cpu(le->dl_inode_blk) - 1 ) *
                                                         QNX4_INODES_PER_BLOCK +
                                                         le->dl_inode_ndx;
                                         }
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
index aa92d6b76a9a..b79162a35478 100644
--- a/fs/qnx4/inode.c
+++ b/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);
-        qnx4_nxtnt_t nxtnt = le16_to_cpu(qnx4_inode->di_num_xtnts);
+        u16 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_cpu( *(__u32*)bh->b_data ) != QNX4_SUPER_MAGIC ) {
+        if ( le32_to_cpup((__le32*) bh->b_data) != QNX4_SUPER_MAGIC ) {
                 if (!silent)
                         printk("qnx4: wrong fsid in superblock.\n");
                 goto out;
diff --git a/include/asm-i386/string.h b/include/asm-i386/string.h
index 6a78ac58c194..02c8f5d22065 100644
--- a/include/asm-i386/string.h
+++ b/include/asm-i386/string.h
@@ -116,7 +116,8 @@ __asm__ __volatile__(
         "orb $1,%%al\n"
         "3:"
         :"=a" (__res), "=&S" (d0), "=&D" (d1)
-                     :"1" (cs),"2" (ct));
+        :"1" (cs),"2" (ct)
+        :"memory");
 return __res;
 }
 
@@ -138,8 +139,9 @@ __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));
+        :"=a" (__res), "=&S" (d0), "=&D" (d1), "=&c" (d2)
+        :"1" (cs),"2" (ct),"3" (count)
+        :"memory");
 return __res;
 }
 
@@ -158,7 +160,9 @@ __asm__ __volatile__(
         "movl $1,%1\n"
         "2:\tmovl %1,%0\n\t"
         "decl %0"
-        :"=a" (__res), "=&S" (d0) : "1" (s),"0" (c));
+        :"=a" (__res), "=&S" (d0)
+        :"1" (s),"0" (c)
+        :"memory");
 return __res;
 }
 
@@ -175,7 +179,9 @@ __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));
+        :"=g" (__res), "=&S" (d0), "=&a" (d1)
+        :"0" (0),"1" (s),"2" (c)
+        :"memory");
 return __res;
 }
 
@@ -189,7 +195,9 @@ __asm__ __volatile__(
         "scasb\n\t"
         "notl %0\n\t"
         "decl %0"
-        :"=c" (__res), "=&D" (d0) :"1" (s),"a" (0), "0" (0xffffffffu));
+        :"=c" (__res), "=&D" (d0)
+        :"1" (s),"a" (0), "0" (0xffffffffu)
+        :"memory");
 return __res;
 }
 
@@ -333,7 +341,9 @@ __asm__ __volatile__(
         "je 1f\n\t"
         "movl $1,%0\n"
         "1:\tdecl %0"
-        :"=D" (__res), "=&c" (d0) : "a" (c),"0" (cs),"1" (count));
+        :"=D" (__res), "=&c" (d0)
+        :"a" (c),"0" (cs),"1" (count)
+        :"memory");
 return __res;
 }
 
@@ -369,7 +379,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);     
@@ -392,7 +402,8 @@ __asm__ __volatile__(
         "jne 1b\n"
         "3:\tsubl %2,%0"
         :"=a" (__res), "=&d" (d0)
-        :"c" (s),"1" (count));
+        :"c" (s),"1" (count)
+        :"memory");
 return __res;
 }
 /* end of additional stuff */
@@ -473,7 +484,8 @@ 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));
+                : "0" (addr), "1" (size), "a" (c)
+                : "memory");
         return addr;
 }
 
diff --git a/include/linux/qnx4_fs.h b/include/linux/qnx4_fs.h
index 22ba580b0ae8..fc610bb0f733 100644
--- a/include/linux/qnx4_fs.h
+++ b/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;
-        __u32           di_xblk;
-        __s32           di_ftime;
-        __s32           di_mtime;
-        __s32           di_atime;
-        __s32           di_ctime;
+        __le32          di_xblk;
+        __le32          di_ftime;
+        __le32          di_mtime;
+        __le32          di_atime;
+        __le32          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];
-        __u32           dl_inode_blk;
+        __le32          dl_inode_blk;
         __u8            dl_inode_ndx;
         __u8            dl_spare[10];
         __u8            dl_status;
 };
 
 struct qnx4_xblk {
-        __u32           xblk_next_xblk;
-        __u32           xblk_prev_xblk;
+        __le32          xblk_next_xblk;
+        __le32          xblk_prev_xblk;
         __u8            xblk_num_xtnts;
         __u8            xblk_spare[3];
-        __s32           xblk_num_blocks;
+        __le32          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/include/linux/qnxtypes.h b/include/linux/qnxtypes.h
index fb518e318c7c..a3eb1137857b 100644
--- a/include/linux/qnxtypes.h
+++ b/include/linux/qnxtypes.h
@@ -12,18 +12,18 @@
 #ifndef _QNX4TYPES_H
 #define _QNX4TYPES_H
 
-typedef __u16 qnx4_nxtnt_t;
+typedef __le16 qnx4_nxtnt_t;
 typedef __u8  qnx4_ftype_t;
 
 typedef struct {
-        __u32 xtnt_blk;
-        __u32 xtnt_size;
+        __le32 xtnt_blk;
+        __le32 xtnt_size;
 } qnx4_xtnt_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;
+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;
 
 #endif