diff options
Diffstat (limited to 'sound/oss/dmasound/dmasound_paula.c')
-rw-r--r-- | sound/oss/dmasound/dmasound_paula.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c index 541781507e63..494070a3f870 100644 --- a/sound/oss/dmasound/dmasound_paula.c +++ b/sound/oss/dmasound/dmasound_paula.c | |||
@@ -157,7 +157,7 @@ static int AmiStateInfo(char *buffer, size_t space); | |||
157 | * Native format | 157 | * Native format |
158 | */ | 158 | */ |
159 | 159 | ||
160 | static ssize_t ami_ct_s8(const u_char *userPtr, size_t userCount, | 160 | static ssize_t ami_ct_s8(const u_char __user *userPtr, size_t userCount, |
161 | u_char frame[], ssize_t *frameUsed, ssize_t frameLeft) | 161 | u_char frame[], ssize_t *frameUsed, ssize_t frameLeft) |
162 | { | 162 | { |
163 | ssize_t count, used; | 163 | ssize_t count, used; |
@@ -190,7 +190,7 @@ static ssize_t ami_ct_s8(const u_char *userPtr, size_t userCount, | |||
190 | */ | 190 | */ |
191 | 191 | ||
192 | #define GENERATE_AMI_CT8(funcname, convsample) \ | 192 | #define GENERATE_AMI_CT8(funcname, convsample) \ |
193 | static ssize_t funcname(const u_char *userPtr, size_t userCount, \ | 193 | static ssize_t funcname(const u_char __user *userPtr, size_t userCount, \ |
194 | u_char frame[], ssize_t *frameUsed, \ | 194 | u_char frame[], ssize_t *frameUsed, \ |
195 | ssize_t frameLeft) \ | 195 | ssize_t frameLeft) \ |
196 | { \ | 196 | { \ |
@@ -241,11 +241,11 @@ GENERATE_AMI_CT8(ami_ct_u8, AMI_CT_U8) | |||
241 | */ | 241 | */ |
242 | 242 | ||
243 | #define GENERATE_AMI_CT_16(funcname, convsample) \ | 243 | #define GENERATE_AMI_CT_16(funcname, convsample) \ |
244 | static ssize_t funcname(const u_char *userPtr, size_t userCount, \ | 244 | static ssize_t funcname(const u_char __user *userPtr, size_t userCount, \ |
245 | u_char frame[], ssize_t *frameUsed, \ | 245 | u_char frame[], ssize_t *frameUsed, \ |
246 | ssize_t frameLeft) \ | 246 | ssize_t frameLeft) \ |
247 | { \ | 247 | { \ |
248 | const u_short *ptr = (const u_short *)userPtr; \ | 248 | const u_short __user *ptr = (const u_short __user *)userPtr; \ |
249 | ssize_t count, used; \ | 249 | ssize_t count, used; \ |
250 | u_short data; \ | 250 | u_short data; \ |
251 | \ | 251 | \ |