3 files changed, 23 insertions, 21 deletions

diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index cc935427d532..c45d6a05b984 100644
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -591,11 +591,15 @@ ia32_sys_call_table:
         .quad compat_sys_mq_getsetattr
         .quad compat_sys_kexec_load     /* reserved for kexec */
         .quad compat_sys_waitid
-        .quad quiet_ni_syscall          /* sys_altroot */
+        .quad quiet_ni_syscall          /* 285: sys_altroot */
         .quad sys_add_key
         .quad sys_request_key
         .quad sys_keyctl
-        /* don't forget to change IA32_NR_syscalls */
+        .quad sys_ioprio_set
+        .quad sys_ioprio_get            /* 290 */
+        .quad sys_inotify_init
+        .quad sys_inotify_add_watch
+        .quad sys_inotify_rm_watch
 ia32_syscall_end:               
         .rept IA32_NR_syscalls-(ia32_syscall_end-ia32_sys_call_table)/8
                 .quad ni_syscall
diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86_64/ia32/sys_ia32.c
index 68a9ab06ee7c..be996d1b691e 100644
--- a/arch/x86_64/ia32/sys_ia32.c
+++ b/arch/x86_64/ia32/sys_ia32.c
@@ -61,6 +61,7 @@
 #include <linux/ptrace.h>
 #include <linux/highuid.h>
 #include <linux/vmalloc.h>
+#include <linux/fsnotify.h>
 #include <asm/mman.h>
 #include <asm/types.h>
 #include <asm/uaccess.h>
@@ -984,8 +985,10 @@ asmlinkage long sys32_open(const char __user * filename, int flags, int mode)
                         if (IS_ERR(f)) {
                                 put_unused_fd(fd); 
                                 fd = error;
-                        } else
+                        } else {
+                                fsnotify_open(f->f_dentry);
                                 fd_install(fd, f);
+                        }
                 }
                 putname(tmp);
         }
diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c
index 57e71dbdfd69..47f95687905f 100644
--- a/arch/x86_64/kernel/reboot.c
+++ b/arch/x86_64/kernel/reboot.c
@@ -109,23 +109,10 @@ void machine_shutdown(void)
         local_irq_enable();
 }
 
-void machine_restart(char * __unused)
+void machine_emergency_restart(void)
 {
         int i;
 
-        printk("machine restart\n");
-
-        machine_shutdown();
-
-        if (!reboot_force) {
-                local_irq_disable();
-#ifndef CONFIG_SMP
-                disable_local_APIC();
-#endif
-                disable_IO_APIC();
-                local_irq_enable();
-        }
-        
         /* Tell the BIOS if we want cold or warm reboot */
         *((unsigned short *)__va(0x472)) = reboot_mode;
        
@@ -150,18 +137,26 @@ void machine_restart(char * __unused)
         }      
 }
 
-EXPORT_SYMBOL(machine_restart);
+void machine_restart(char * __unused)
+{
+        printk("machine restart\n");
+
+        if (!reboot_force) {
+                machine_shutdown();
+        }
+        machine_emergency_restart();
+}
 
 void machine_halt(void)
 {
 }
 
-EXPORT_SYMBOL(machine_halt);
-
 void machine_power_off(void)
 {
+        if (!reboot_force) {
+                machine_shutdown();
+        }
         if (pm_power_off)
                 pm_power_off();
 }
 
-EXPORT_SYMBOL(machine_power_off);