3 files changed, 9 insertions, 8 deletions

diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
index 99a485f1364..f2436d33fbf 100644
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
@@ -1052,7 +1052,7 @@ static ssize_t snd_seq_write(struct file *file, const char __user *buf,
                 } else {
 #ifdef CONFIG_COMPAT
                         if (client->convert32 && snd_seq_ev_is_varusr(&event)) {
-                                void *ptr = compat_ptr(event.data.raw32.d[1]);
+                                void *ptr = (void __force *)compat_ptr(event.data.raw32.d[1]);
                                 event.data.ext.ptr = ptr;
                         }
 #endif
@@ -2407,7 +2407,7 @@ int snd_seq_kernel_client_ctl(int clientid, unsigned int cmd, void *arg)
         if (client == NULL)
                 return -ENXIO;
         fs = snd_enter_user();
-        result = snd_seq_do_ioctl(client, cmd, (void __user *)arg);
+        result = snd_seq_do_ioctl(client, cmd, (void __force __user *)arg);
         snd_leave_user(fs);
         return result;
 }
@@ -2497,9 +2497,6 @@ static void snd_seq_info_dump_ports(struct snd_info_buffer *buffer,
 }
 
 
-void snd_seq_info_pool(struct snd_info_buffer *buffer,
-                       struct snd_seq_pool *pool, char *space);
-
 /* exported to seq_info.c */
 void snd_seq_info_clients_read(struct snd_info_entry *entry, 
                                struct snd_info_buffer *buffer)
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c
index 7fb55436287..7f50c143767 100644
--- a/sound/core/seq/seq_memory.c
+++ b/sound/core/seq/seq_memory.c
@@ -86,7 +86,7 @@ int snd_seq_dump_var_event(const struct snd_seq_event *event,
 
         if (event->data.ext.len & SNDRV_SEQ_EXT_USRPTR) {
                 char buf[32];
-                char __user *curptr = (char __user *)event->data.ext.ptr;
+                char __user *curptr = (char __force __user *)event->data.ext.ptr;
                 while (len > 0) {
                         int size = sizeof(buf);
                         if (len < size)
@@ -157,7 +157,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char
         if (event->data.ext.len & SNDRV_SEQ_EXT_USRPTR) {
                 if (! in_kernel)
                         return -EINVAL;
-                if (copy_from_user(buf, (void __user *)event->data.ext.ptr, len))
+                if (copy_from_user(buf, (void __force __user *)event->data.ext.ptr, len))
                         return -EFAULT;
                 return newlen;
         }
@@ -343,7 +343,7 @@ int snd_seq_event_dup(struct snd_seq_pool *pool, struct snd_seq_event *event,
                                 tmp->event = src->event;
                                 src = src->next;
                         } else if (is_usrptr) {
-                                if (copy_from_user(&tmp->event, (char __user *)buf, size)) {
+                                if (copy_from_user(&tmp->event, (char __force __user *)buf, size)) {
                                         err = -EFAULT;
                                         goto __error;
                                 }
diff --git a/sound/core/seq/seq_memory.h b/sound/core/seq/seq_memory.h
index 63e91431a29..4a2ec779b8a 100644
--- a/sound/core/seq/seq_memory.h
+++ b/sound/core/seq/seq_memory.h
@@ -24,6 +24,8 @@
 #include <sound/seq_kernel.h>
 #include <linux/poll.h>
 
+struct snd_info_buffer;
+
 /* container for sequencer event (internal use) */
 struct snd_seq_event_cell {
         struct snd_seq_event event;
@@ -99,5 +101,7 @@ void snd_sequencer_memory_done(void);
 /* polling */
 int snd_seq_pool_poll_wait(struct snd_seq_pool *pool, struct file *file, poll_table *wait);
 
+void snd_seq_info_pool(struct snd_info_buffer *buffer,
+                       struct snd_seq_pool *pool, char *space);
 
 #endif