3 files changed, 5 insertions, 4 deletions

diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index 52be79beb306..21868f9bed7c 100644
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -716,7 +716,7 @@ ia32_sys_call_table:
         .quad sys_getcpu
         .quad sys_epoll_pwait
         .quad compat_sys_utimensat      /* 320 */
-        .quad sys_signalfd
-        .quad sys_timerfd
+        .quad compat_sys_signalfd
+        .quad compat_sys_timerfd
         .quad sys_eventfd
-ia32_syscall_end:               
+ia32_syscall_end:
diff --git a/arch/x86_64/kernel/bugs.c b/arch/x86_64/kernel/bugs.c
index c141e7a7ff55..c3c6b91566ed 100644
--- a/arch/x86_64/kernel/bugs.c
+++ b/arch/x86_64/kernel/bugs.c
@@ -9,6 +9,7 @@
 #include <linux/init.h>
 #include <asm/alternative.h>
 #include <asm/processor.h>
+#include <asm/mtrr.h>
 
 void __init check_bugs(void)
 {
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index 6c4dfcb0feb9..c77a1a1fd46b 100644
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -985,7 +985,7 @@ static void __exit pm3fb_exit(void)
         pci_unregister_driver(&pm3fb_driver);
 }
 
-#ifdef MODULE
+#ifndef MODULE
         /*
          *  Setup
          */