3 files changed, 7 insertions, 6 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index f747117285f4..d2403e44ff07 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -290,7 +290,7 @@ enum {
 #ifdef CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE
 extern struct cpufreq_governor cpufreq_gov_performance;
 #define CPUFREQ_DEFAULT_GOVERNOR	&cpufreq_gov_performance
-#elif CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE
+#elif defined(CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE)
 extern struct cpufreq_governor cpufreq_gov_userspace;
 #define CPUFREQ_DEFAULT_GOVERNOR	&cpufreq_gov_userspace
 #endif
diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h
index f89acbe8183a..1ece9f119220 100644
--- a/include/linux/eventpoll.h
+++ b/include/linux/eventpoll.h
@@ -48,9 +48,10 @@ struct file;
 
 /* Kernel space functions implementing the user space "epoll" API */
 asmlinkage long sys_epoll_create(int size);
-asmlinkage long sys_epoll_ctl(int epfd, int op, int fd, struct epoll_event *event);
-asmlinkage long sys_epoll_wait(int epfd, struct epoll_event *events, int maxevents,
-			       int timeout);
+asmlinkage long sys_epoll_ctl(int epfd, int op, int fd,
+			      struct epoll_event __user *event);
+asmlinkage long sys_epoll_wait(int epfd, struct epoll_event __user *events,
+			       int maxevents, int timeout);
 
 #ifdef CONFIG_EPOLL
 
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index cb7d5d6a75b0..373e58fee2d4 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -80,8 +80,8 @@ extern int dirty_expire_centisecs;
 
 struct ctl_table;
 struct file;
-int dirty_writeback_centisecs_handler(struct ctl_table *, int, struct file *, 
-					  void *, size_t *);
+int dirty_writeback_centisecs_handler(struct ctl_table *, int, struct file *,
+				      void __user *, size_t *);
 
 void page_writeback_init(void);
 void balance_dirty_pages(struct address_space *mapping);