ia64: More merge fixes.

diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index b6f52b0c1cf3b25970cf4a118b4bdc3fc37eaf38..e1c9a5ead71b88e73d33cf561d56af07c1baf7a2 100644 (file)
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -499,7 +499,7 @@ smp_prepare_cpus (unsigned int max_cpus)
        /*
         * If SMP should be disabled, then really disable it!
         */
-       if (!max_cpus || (max_cpus < -1)) {
+       if (!max_cpus) {
                printk(KERN_INFO "SMP mode deactivated.\n");
                cpu_online_map = phys_cpu_present_map = 1;
                return;

diff --git a/include/asm-ia64/compat.h b/include/asm-ia64/compat.h
index 1f3364ac04083ceccd29bcadd7cdd9aedb4cf0aa..a01babfd700e23ab61be5a691de796d619bfc58c 100644 (file)
--- a/include/asm-ia64/compat.h
+++ b/include/asm-ia64/compat.h
@@ -36,7 +36,7 @@ struct compat_stat {
        compat_ino_t    st_ino;
        compat_mode_t   st_mode;
        compat_nlink_t  st_nlink;
-       compay_uid_t    st_uid;
+       compat_uid_t    st_uid;
        compat_gid_t    st_gid;
        compat_dev_t    st_rdev;
        u16             __pad2;
@@ -44,11 +44,11 @@ struct compat_stat {
        u32             st_blksize;
        u32             st_blocks;
        u32             st_atime;
-       u32             __unused1;
+       u32             st_atime_nsec;
        u32             st_mtime;
-       u32             __unused2;
+       u32             st_mtime_nsec;
        u32             st_ctime;
-       u32             __unused3;
+       u32             st_ctime_nsec;
        u32             __unused4;
        u32             __unused5;
 };