aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-01-12 04:06:33 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 12:09:04 -0500
commit031eb4cddec7a4825212ece47de4bd64cd8e0bee (patch)
tree0d421db4aada37806e8ce0202a05fb3914895228 /sound/oss
parentd998265feb7cbcf74e27e3057dac309dcad47bf7 (diff)
[PATCH] m68k: dmasound __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/dmasound/dmasound_atari.c94
-rw-r--r--sound/oss/dmasound/dmasound_paula.c8
-rw-r--r--sound/oss/dmasound/dmasound_q40.c18
3 files changed, 60 insertions, 60 deletions
diff --git a/sound/oss/dmasound/dmasound_atari.c b/sound/oss/dmasound/dmasound_atari.c
index b747e77238f8..dc31373069a5 100644
--- a/sound/oss/dmasound/dmasound_atari.c
+++ b/sound/oss/dmasound/dmasound_atari.c
@@ -67,46 +67,46 @@ static int expand_data; /* Data for expanding */
67 * ++geert: split in even more functions (one per format) 67 * ++geert: split in even more functions (one per format)
68 */ 68 */
69 69
70static ssize_t ata_ct_law(const u_char *userPtr, size_t userCount, 70static ssize_t ata_ct_law(const u_char __user *userPtr, size_t userCount,
71 u_char frame[], ssize_t *frameUsed, 71 u_char frame[], ssize_t *frameUsed,
72 ssize_t frameLeft); 72 ssize_t frameLeft);
73static ssize_t ata_ct_s8(const u_char *userPtr, size_t userCount, 73static ssize_t ata_ct_s8(const u_char __user *userPtr, size_t userCount,
74 u_char frame[], ssize_t *frameUsed, 74 u_char frame[], ssize_t *frameUsed,
75 ssize_t frameLeft); 75 ssize_t frameLeft);
76static ssize_t ata_ct_u8(const u_char *userPtr, size_t userCount, 76static ssize_t ata_ct_u8(const u_char __user *userPtr, size_t userCount,
77 u_char frame[], ssize_t *frameUsed, 77 u_char frame[], ssize_t *frameUsed,
78 ssize_t frameLeft); 78 ssize_t frameLeft);
79static ssize_t ata_ct_s16be(const u_char *userPtr, size_t userCount, 79static ssize_t ata_ct_s16be(const u_char __user *userPtr, size_t userCount,
80 u_char frame[], ssize_t *frameUsed, 80 u_char frame[], ssize_t *frameUsed,
81 ssize_t frameLeft); 81 ssize_t frameLeft);
82static ssize_t ata_ct_u16be(const u_char *userPtr, size_t userCount, 82static ssize_t ata_ct_u16be(const u_char __user *userPtr, size_t userCount,
83 u_char frame[], ssize_t *frameUsed, 83 u_char frame[], ssize_t *frameUsed,
84 ssize_t frameLeft); 84 ssize_t frameLeft);
85static ssize_t ata_ct_s16le(const u_char *userPtr, size_t userCount, 85static ssize_t ata_ct_s16le(const u_char __user *userPtr, size_t userCount,
86 u_char frame[], ssize_t *frameUsed, 86 u_char frame[], ssize_t *frameUsed,
87 ssize_t frameLeft); 87 ssize_t frameLeft);
88static ssize_t ata_ct_u16le(const u_char *userPtr, size_t userCount, 88static ssize_t ata_ct_u16le(const u_char __user *userPtr, size_t userCount,
89 u_char frame[], ssize_t *frameUsed, 89 u_char frame[], ssize_t *frameUsed,
90 ssize_t frameLeft); 90 ssize_t frameLeft);
91static ssize_t ata_ctx_law(const u_char *userPtr, size_t userCount, 91static ssize_t ata_ctx_law(const u_char __user *userPtr, size_t userCount,
92 u_char frame[], ssize_t *frameUsed, 92 u_char frame[], ssize_t *frameUsed,
93 ssize_t frameLeft); 93 ssize_t frameLeft);
94static ssize_t ata_ctx_s8(const u_char *userPtr, size_t userCount, 94static ssize_t ata_ctx_s8(const u_char __user *userPtr, size_t userCount,
95 u_char frame[], ssize_t *frameUsed, 95 u_char frame[], ssize_t *frameUsed,
96 ssize_t frameLeft); 96 ssize_t frameLeft);
97static ssize_t ata_ctx_u8(const u_char *userPtr, size_t userCount, 97static ssize_t ata_ctx_u8(const u_char __user *userPtr, size_t userCount,
98 u_char frame[], ssize_t *frameUsed, 98 u_char frame[], ssize_t *frameUsed,
99 ssize_t frameLeft); 99 ssize_t frameLeft);
100static ssize_t ata_ctx_s16be(const u_char *userPtr, size_t userCount, 100static ssize_t ata_ctx_s16be(const u_char __user *userPtr, size_t userCount,
101 u_char frame[], ssize_t *frameUsed, 101 u_char frame[], ssize_t *frameUsed,
102 ssize_t frameLeft); 102 ssize_t frameLeft);
103static ssize_t ata_ctx_u16be(const u_char *userPtr, size_t userCount, 103static ssize_t ata_ctx_u16be(const u_char __user *userPtr, size_t userCount,
104 u_char frame[], ssize_t *frameUsed, 104 u_char frame[], ssize_t *frameUsed,
105 ssize_t frameLeft); 105 ssize_t frameLeft);
106static ssize_t ata_ctx_s16le(const u_char *userPtr, size_t userCount, 106static ssize_t ata_ctx_s16le(const u_char __user *userPtr, size_t userCount,
107 u_char frame[], ssize_t *frameUsed, 107 u_char frame[], ssize_t *frameUsed,
108 ssize_t frameLeft); 108 ssize_t frameLeft);
109static ssize_t ata_ctx_u16le(const u_char *userPtr, size_t userCount, 109static ssize_t ata_ctx_u16le(const u_char __user *userPtr, size_t userCount,
110 u_char frame[], ssize_t *frameUsed, 110 u_char frame[], ssize_t *frameUsed,
111 ssize_t frameLeft); 111 ssize_t frameLeft);
112 112
@@ -151,7 +151,7 @@ static int FalconStateInfo(char *buffer, size_t space);
151/*** Translations ************************************************************/ 151/*** Translations ************************************************************/
152 152
153 153
154static ssize_t ata_ct_law(const u_char *userPtr, size_t userCount, 154static ssize_t ata_ct_law(const u_char __user *userPtr, size_t userCount,
155 u_char frame[], ssize_t *frameUsed, 155 u_char frame[], ssize_t *frameUsed,
156 ssize_t frameLeft) 156 ssize_t frameLeft)
157{ 157{
@@ -176,7 +176,7 @@ static ssize_t ata_ct_law(const u_char *userPtr, size_t userCount,
176} 176}
177 177
178 178
179static ssize_t ata_ct_s8(const u_char *userPtr, size_t userCount, 179static ssize_t ata_ct_s8(const u_char __user *userPtr, size_t userCount,
180 u_char frame[], ssize_t *frameUsed, 180 u_char frame[], ssize_t *frameUsed,
181 ssize_t frameLeft) 181 ssize_t frameLeft)
182{ 182{
@@ -194,7 +194,7 @@ static ssize_t ata_ct_s8(const u_char *userPtr, size_t userCount,
194} 194}
195 195
196 196
197static ssize_t ata_ct_u8(const u_char *userPtr, size_t userCount, 197static ssize_t ata_ct_u8(const u_char __user *userPtr, size_t userCount,
198 u_char frame[], ssize_t *frameUsed, 198 u_char frame[], ssize_t *frameUsed,
199 ssize_t frameLeft) 199 ssize_t frameLeft)
200{ 200{
@@ -217,7 +217,7 @@ static ssize_t ata_ct_u8(const u_char *userPtr, size_t userCount,
217 used = count*2; 217 used = count*2;
218 while (count > 0) { 218 while (count > 0) {
219 u_short data; 219 u_short data;
220 if (get_user(data, (u_short *)userPtr)) 220 if (get_user(data, (u_short __user *)userPtr))
221 return -EFAULT; 221 return -EFAULT;
222 userPtr += 2; 222 userPtr += 2;
223 *p++ = data ^ 0x8080; 223 *p++ = data ^ 0x8080;
@@ -229,7 +229,7 @@ static ssize_t ata_ct_u8(const u_char *userPtr, size_t userCount,
229} 229}
230 230
231 231
232static ssize_t ata_ct_s16be(const u_char *userPtr, size_t userCount, 232static ssize_t ata_ct_s16be(const u_char __user *userPtr, size_t userCount,
233 u_char frame[], ssize_t *frameUsed, 233 u_char frame[], ssize_t *frameUsed,
234 ssize_t frameLeft) 234 ssize_t frameLeft)
235{ 235{
@@ -241,7 +241,7 @@ static ssize_t ata_ct_s16be(const u_char *userPtr, size_t userCount,
241 used = count*2; 241 used = count*2;
242 while (count > 0) { 242 while (count > 0) {
243 u_short data; 243 u_short data;
244 if (get_user(data, (u_short *)userPtr)) 244 if (get_user(data, (u_short __user *)userPtr))
245 return -EFAULT; 245 return -EFAULT;
246 userPtr += 2; 246 userPtr += 2;
247 *p++ = data; 247 *p++ = data;
@@ -261,7 +261,7 @@ static ssize_t ata_ct_s16be(const u_char *userPtr, size_t userCount,
261} 261}
262 262
263 263
264static ssize_t ata_ct_u16be(const u_char *userPtr, size_t userCount, 264static ssize_t ata_ct_u16be(const u_char __user *userPtr, size_t userCount,
265 u_char frame[], ssize_t *frameUsed, 265 u_char frame[], ssize_t *frameUsed,
266 ssize_t frameLeft) 266 ssize_t frameLeft)
267{ 267{
@@ -273,7 +273,7 @@ static ssize_t ata_ct_u16be(const u_char *userPtr, size_t userCount,
273 used = count*2; 273 used = count*2;
274 while (count > 0) { 274 while (count > 0) {
275 u_short data; 275 u_short data;
276 if (get_user(data, (u_short *)userPtr)) 276 if (get_user(data, (u_short __user *)userPtr))
277 return -EFAULT; 277 return -EFAULT;
278 userPtr += 2; 278 userPtr += 2;
279 data ^= 0x8000; 279 data ^= 0x8000;
@@ -287,8 +287,8 @@ static ssize_t ata_ct_u16be(const u_char *userPtr, size_t userCount,
287 count = min_t(unsigned long, userCount, frameLeft)>>2; 287 count = min_t(unsigned long, userCount, frameLeft)>>2;
288 used = count*4; 288 used = count*4;
289 while (count > 0) { 289 while (count > 0) {
290 u_long data; 290 u_int data;
291 if (get_user(data, (u_int *)userPtr)) 291 if (get_user(data, (u_int __user *)userPtr))
292 return -EFAULT; 292 return -EFAULT;
293 userPtr += 4; 293 userPtr += 4;
294 *p++ = data ^ 0x80008000; 294 *p++ = data ^ 0x80008000;
@@ -300,7 +300,7 @@ static ssize_t ata_ct_u16be(const u_char *userPtr, size_t userCount,
300} 300}
301 301
302 302
303static ssize_t ata_ct_s16le(const u_char *userPtr, size_t userCount, 303static ssize_t ata_ct_s16le(const u_char __user *userPtr, size_t userCount,
304 u_char frame[], ssize_t *frameUsed, 304 u_char frame[], ssize_t *frameUsed,
305 ssize_t frameLeft) 305 ssize_t frameLeft)
306{ 306{
@@ -313,7 +313,7 @@ static ssize_t ata_ct_s16le(const u_char *userPtr, size_t userCount,
313 used = count*2; 313 used = count*2;
314 while (count > 0) { 314 while (count > 0) {
315 u_short data; 315 u_short data;
316 if (get_user(data, (u_short *)userPtr)) 316 if (get_user(data, (u_short __user *)userPtr))
317 return -EFAULT; 317 return -EFAULT;
318 userPtr += 2; 318 userPtr += 2;
319 data = le2be16(data); 319 data = le2be16(data);
@@ -328,7 +328,7 @@ static ssize_t ata_ct_s16le(const u_char *userPtr, size_t userCount,
328 used = count*4; 328 used = count*4;
329 while (count > 0) { 329 while (count > 0) {
330 u_long data; 330 u_long data;
331 if (get_user(data, (u_int *)userPtr)) 331 if (get_user(data, (u_int __user *)userPtr))
332 return -EFAULT; 332 return -EFAULT;
333 userPtr += 4; 333 userPtr += 4;
334 data = le2be16dbl(data); 334 data = le2be16dbl(data);
@@ -341,7 +341,7 @@ static ssize_t ata_ct_s16le(const u_char *userPtr, size_t userCount,
341} 341}
342 342
343 343
344static ssize_t ata_ct_u16le(const u_char *userPtr, size_t userCount, 344static ssize_t ata_ct_u16le(const u_char __user *userPtr, size_t userCount,
345 u_char frame[], ssize_t *frameUsed, 345 u_char frame[], ssize_t *frameUsed,
346 ssize_t frameLeft) 346 ssize_t frameLeft)
347{ 347{
@@ -354,7 +354,7 @@ static ssize_t ata_ct_u16le(const u_char *userPtr, size_t userCount,
354 used = count*2; 354 used = count*2;
355 while (count > 0) { 355 while (count > 0) {
356 u_short data; 356 u_short data;
357 if (get_user(data, (u_short *)userPtr)) 357 if (get_user(data, (u_short __user *)userPtr))
358 return -EFAULT; 358 return -EFAULT;
359 userPtr += 2; 359 userPtr += 2;
360 data = le2be16(data) ^ 0x8000; 360 data = le2be16(data) ^ 0x8000;
@@ -368,7 +368,7 @@ static ssize_t ata_ct_u16le(const u_char *userPtr, size_t userCount,
368 used = count; 368 used = count;
369 while (count > 0) { 369 while (count > 0) {
370 u_long data; 370 u_long data;
371 if (get_user(data, (u_int *)userPtr)) 371 if (get_user(data, (u_int __user *)userPtr))
372 return -EFAULT; 372 return -EFAULT;
373 userPtr += 4; 373 userPtr += 4;
374 data = le2be16dbl(data) ^ 0x80008000; 374 data = le2be16dbl(data) ^ 0x80008000;
@@ -381,7 +381,7 @@ static ssize_t ata_ct_u16le(const u_char *userPtr, size_t userCount,
381} 381}
382 382
383 383
384static ssize_t ata_ctx_law(const u_char *userPtr, size_t userCount, 384static ssize_t ata_ctx_law(const u_char __user *userPtr, size_t userCount,
385 u_char frame[], ssize_t *frameUsed, 385 u_char frame[], ssize_t *frameUsed,
386 ssize_t frameLeft) 386 ssize_t frameLeft)
387{ 387{
@@ -443,7 +443,7 @@ static ssize_t ata_ctx_law(const u_char *userPtr, size_t userCount,
443} 443}
444 444
445 445
446static ssize_t ata_ctx_s8(const u_char *userPtr, size_t userCount, 446static ssize_t ata_ctx_s8(const u_char __user *userPtr, size_t userCount,
447 u_char frame[], ssize_t *frameUsed, 447 u_char frame[], ssize_t *frameUsed,
448 ssize_t frameLeft) 448 ssize_t frameLeft)
449{ 449{
@@ -478,7 +478,7 @@ static ssize_t ata_ctx_s8(const u_char *userPtr, size_t userCount,
478 if (bal < 0) { 478 if (bal < 0) {
479 if (userCount < 2) 479 if (userCount < 2)
480 break; 480 break;
481 if (get_user(data, (u_short *)userPtr)) 481 if (get_user(data, (u_short __user *)userPtr))
482 return -EFAULT; 482 return -EFAULT;
483 userPtr += 2; 483 userPtr += 2;
484 userCount -= 2; 484 userCount -= 2;
@@ -497,7 +497,7 @@ static ssize_t ata_ctx_s8(const u_char *userPtr, size_t userCount,
497} 497}
498 498
499 499
500static ssize_t ata_ctx_u8(const u_char *userPtr, size_t userCount, 500static ssize_t ata_ctx_u8(const u_char __user *userPtr, size_t userCount,
501 u_char frame[], ssize_t *frameUsed, 501 u_char frame[], ssize_t *frameUsed,
502 ssize_t frameLeft) 502 ssize_t frameLeft)
503{ 503{
@@ -533,7 +533,7 @@ static ssize_t ata_ctx_u8(const u_char *userPtr, size_t userCount,
533 if (bal < 0) { 533 if (bal < 0) {
534 if (userCount < 2) 534 if (userCount < 2)
535 break; 535 break;
536 if (get_user(data, (u_short *)userPtr)) 536 if (get_user(data, (u_short __user *)userPtr))
537 return -EFAULT; 537 return -EFAULT;
538 userPtr += 2; 538 userPtr += 2;
539 data ^= 0x8080; 539 data ^= 0x8080;
@@ -553,7 +553,7 @@ static ssize_t ata_ctx_u8(const u_char *userPtr, size_t userCount,
553} 553}
554 554
555 555
556static ssize_t ata_ctx_s16be(const u_char *userPtr, size_t userCount, 556static ssize_t ata_ctx_s16be(const u_char __user *userPtr, size_t userCount,
557 u_char frame[], ssize_t *frameUsed, 557 u_char frame[], ssize_t *frameUsed,
558 ssize_t frameLeft) 558 ssize_t frameLeft)
559{ 559{
@@ -571,7 +571,7 @@ static ssize_t ata_ctx_s16be(const u_char *userPtr, size_t userCount,
571 if (bal < 0) { 571 if (bal < 0) {
572 if (userCount < 2) 572 if (userCount < 2)
573 break; 573 break;
574 if (get_user(data, (u_short *)userPtr)) 574 if (get_user(data, (u_short __user *)userPtr))
575 return -EFAULT; 575 return -EFAULT;
576 userPtr += 2; 576 userPtr += 2;
577 userCount -= 2; 577 userCount -= 2;
@@ -590,7 +590,7 @@ static ssize_t ata_ctx_s16be(const u_char *userPtr, size_t userCount,
590 if (bal < 0) { 590 if (bal < 0) {
591 if (userCount < 4) 591 if (userCount < 4)
592 break; 592 break;
593 if (get_user(data, (u_int *)userPtr)) 593 if (get_user(data, (u_int __user *)userPtr))
594 return -EFAULT; 594 return -EFAULT;
595 userPtr += 4; 595 userPtr += 4;
596 userCount -= 4; 596 userCount -= 4;
@@ -609,7 +609,7 @@ static ssize_t ata_ctx_s16be(const u_char *userPtr, size_t userCount,
609} 609}
610 610
611 611
612static ssize_t ata_ctx_u16be(const u_char *userPtr, size_t userCount, 612static ssize_t ata_ctx_u16be(const u_char __user *userPtr, size_t userCount,
613 u_char frame[], ssize_t *frameUsed, 613 u_char frame[], ssize_t *frameUsed,
614 ssize_t frameLeft) 614 ssize_t frameLeft)
615{ 615{
@@ -627,7 +627,7 @@ static ssize_t ata_ctx_u16be(const u_char *userPtr, size_t userCount,
627 if (bal < 0) { 627 if (bal < 0) {
628 if (userCount < 2) 628 if (userCount < 2)
629 break; 629 break;
630 if (get_user(data, (u_short *)userPtr)) 630 if (get_user(data, (u_short __user *)userPtr))
631 return -EFAULT; 631 return -EFAULT;
632 userPtr += 2; 632 userPtr += 2;
633 data ^= 0x8000; 633 data ^= 0x8000;
@@ -647,7 +647,7 @@ static ssize_t ata_ctx_u16be(const u_char *userPtr, size_t userCount,
647 if (bal < 0) { 647 if (bal < 0) {
648 if (userCount < 4) 648 if (userCount < 4)
649 break; 649 break;
650 if (get_user(data, (u_int *)userPtr)) 650 if (get_user(data, (u_int __user *)userPtr))
651 return -EFAULT; 651 return -EFAULT;
652 userPtr += 4; 652 userPtr += 4;
653 data ^= 0x80008000; 653 data ^= 0x80008000;
@@ -667,7 +667,7 @@ static ssize_t ata_ctx_u16be(const u_char *userPtr, size_t userCount,
667} 667}
668 668
669 669
670static ssize_t ata_ctx_s16le(const u_char *userPtr, size_t userCount, 670static ssize_t ata_ctx_s16le(const u_char __user *userPtr, size_t userCount,
671 u_char frame[], ssize_t *frameUsed, 671 u_char frame[], ssize_t *frameUsed,
672 ssize_t frameLeft) 672 ssize_t frameLeft)
673{ 673{
@@ -685,7 +685,7 @@ static ssize_t ata_ctx_s16le(const u_char *userPtr, size_t userCount,
685 if (bal < 0) { 685 if (bal < 0) {
686 if (userCount < 2) 686 if (userCount < 2)
687 break; 687 break;
688 if (get_user(data, (u_short *)userPtr)) 688 if (get_user(data, (u_short __user *)userPtr))
689 return -EFAULT; 689 return -EFAULT;
690 userPtr += 2; 690 userPtr += 2;
691 data = le2be16(data); 691 data = le2be16(data);
@@ -705,7 +705,7 @@ static ssize_t ata_ctx_s16le(const u_char *userPtr, size_t userCount,
705 if (bal < 0) { 705 if (bal < 0) {
706 if (userCount < 4) 706 if (userCount < 4)
707 break; 707 break;
708 if (get_user(data, (u_int *)userPtr)) 708 if (get_user(data, (u_int __user *)userPtr))
709 return -EFAULT; 709 return -EFAULT;
710 userPtr += 4; 710 userPtr += 4;
711 data = le2be16dbl(data); 711 data = le2be16dbl(data);
@@ -725,7 +725,7 @@ static ssize_t ata_ctx_s16le(const u_char *userPtr, size_t userCount,
725} 725}
726 726
727 727
728static ssize_t ata_ctx_u16le(const u_char *userPtr, size_t userCount, 728static ssize_t ata_ctx_u16le(const u_char __user *userPtr, size_t userCount,
729 u_char frame[], ssize_t *frameUsed, 729 u_char frame[], ssize_t *frameUsed,
730 ssize_t frameLeft) 730 ssize_t frameLeft)
731{ 731{
@@ -743,7 +743,7 @@ static ssize_t ata_ctx_u16le(const u_char *userPtr, size_t userCount,
743 if (bal < 0) { 743 if (bal < 0) {
744 if (userCount < 2) 744 if (userCount < 2)
745 break; 745 break;
746 if (get_user(data, (u_short *)userPtr)) 746 if (get_user(data, (u_short __user *)userPtr))
747 return -EFAULT; 747 return -EFAULT;
748 userPtr += 2; 748 userPtr += 2;
749 data = le2be16(data) ^ 0x8000; 749 data = le2be16(data) ^ 0x8000;
@@ -763,7 +763,7 @@ static ssize_t ata_ctx_u16le(const u_char *userPtr, size_t userCount,
763 if (bal < 0) { 763 if (bal < 0) {
764 if (userCount < 4) 764 if (userCount < 4)
765 break; 765 break;
766 if (get_user(data, (u_int *)userPtr)) 766 if (get_user(data, (u_int __user *)userPtr))
767 return -EFAULT; 767 return -EFAULT;
768 userPtr += 4; 768 userPtr += 4;
769 data = le2be16dbl(data) ^ 0x80008000; 769 data = le2be16dbl(data) ^ 0x80008000;
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
160static ssize_t ami_ct_s8(const u_char *userPtr, size_t userCount, 160static 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) \
193static ssize_t funcname(const u_char *userPtr, size_t userCount, \ 193static 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) \
244static ssize_t funcname(const u_char *userPtr, size_t userCount, \ 244static 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 \
diff --git a/sound/oss/dmasound/dmasound_q40.c b/sound/oss/dmasound/dmasound_q40.c
index 1ddaa6284b08..e2081f32b0c4 100644
--- a/sound/oss/dmasound/dmasound_q40.c
+++ b/sound/oss/dmasound/dmasound_q40.c
@@ -58,7 +58,7 @@ static void Q40Interrupt(void);
58 58
59 59
60/* userCount, frameUsed, frameLeft == byte counts */ 60/* userCount, frameUsed, frameLeft == byte counts */
61static ssize_t q40_ct_law(const u_char *userPtr, size_t userCount, 61static ssize_t q40_ct_law(const u_char __user *userPtr, size_t userCount,
62 u_char frame[], ssize_t *frameUsed, 62 u_char frame[], ssize_t *frameUsed,
63 ssize_t frameLeft) 63 ssize_t frameLeft)
64{ 64{
@@ -79,7 +79,7 @@ static ssize_t q40_ct_law(const u_char *userPtr, size_t userCount,
79} 79}
80 80
81 81
82static ssize_t q40_ct_s8(const u_char *userPtr, size_t userCount, 82static ssize_t q40_ct_s8(const u_char __user *userPtr, size_t userCount,
83 u_char frame[], ssize_t *frameUsed, 83 u_char frame[], ssize_t *frameUsed,
84 ssize_t frameLeft) 84 ssize_t frameLeft)
85{ 85{
@@ -98,7 +98,7 @@ static ssize_t q40_ct_s8(const u_char *userPtr, size_t userCount,
98 return used; 98 return used;
99} 99}
100 100
101static ssize_t q40_ct_u8(const u_char *userPtr, size_t userCount, 101static ssize_t q40_ct_u8(const u_char __user *userPtr, size_t userCount,
102 u_char frame[], ssize_t *frameUsed, 102 u_char frame[], ssize_t *frameUsed,
103 ssize_t frameLeft) 103 ssize_t frameLeft)
104{ 104{
@@ -114,7 +114,7 @@ static ssize_t q40_ct_u8(const u_char *userPtr, size_t userCount,
114 114
115 115
116/* a bit too complicated to optimise right now ..*/ 116/* a bit too complicated to optimise right now ..*/
117static ssize_t q40_ctx_law(const u_char *userPtr, size_t userCount, 117static ssize_t q40_ctx_law(const u_char __user *userPtr, size_t userCount,
118 u_char frame[], ssize_t *frameUsed, 118 u_char frame[], ssize_t *frameUsed,
119 ssize_t frameLeft) 119 ssize_t frameLeft)
120{ 120{
@@ -152,7 +152,7 @@ static ssize_t q40_ctx_law(const u_char *userPtr, size_t userCount,
152} 152}
153 153
154 154
155static ssize_t q40_ctx_s8(const u_char *userPtr, size_t userCount, 155static ssize_t q40_ctx_s8(const u_char __user *userPtr, size_t userCount,
156 u_char frame[], ssize_t *frameUsed, 156 u_char frame[], ssize_t *frameUsed,
157 ssize_t frameLeft) 157 ssize_t frameLeft)
158{ 158{
@@ -189,7 +189,7 @@ static ssize_t q40_ctx_s8(const u_char *userPtr, size_t userCount,
189} 189}
190 190
191 191
192static ssize_t q40_ctx_u8(const u_char *userPtr, size_t userCount, 192static ssize_t q40_ctx_u8(const u_char __user *userPtr, size_t userCount,
193 u_char frame[], ssize_t *frameUsed, 193 u_char frame[], ssize_t *frameUsed,
194 ssize_t frameLeft) 194 ssize_t frameLeft)
195{ 195{
@@ -224,7 +224,7 @@ static ssize_t q40_ctx_u8(const u_char *userPtr, size_t userCount,
224} 224}
225 225
226/* compressing versions */ 226/* compressing versions */
227static ssize_t q40_ctc_law(const u_char *userPtr, size_t userCount, 227static ssize_t q40_ctc_law(const u_char __user *userPtr, size_t userCount,
228 u_char frame[], ssize_t *frameUsed, 228 u_char frame[], ssize_t *frameUsed,
229 ssize_t frameLeft) 229 ssize_t frameLeft)
230{ 230{
@@ -265,7 +265,7 @@ static ssize_t q40_ctc_law(const u_char *userPtr, size_t userCount,
265} 265}
266 266
267 267
268static ssize_t q40_ctc_s8(const u_char *userPtr, size_t userCount, 268static ssize_t q40_ctc_s8(const u_char __user *userPtr, size_t userCount,
269 u_char frame[], ssize_t *frameUsed, 269 u_char frame[], ssize_t *frameUsed,
270 ssize_t frameLeft) 270 ssize_t frameLeft)
271{ 271{
@@ -304,7 +304,7 @@ static ssize_t q40_ctc_s8(const u_char *userPtr, size_t userCount,
304} 304}
305 305
306 306
307static ssize_t q40_ctc_u8(const u_char *userPtr, size_t userCount, 307static ssize_t q40_ctc_u8(const u_char __user *userPtr, size_t userCount,
308 u_char frame[], ssize_t *frameUsed, 308 u_char frame[], ssize_t *frameUsed,
309 ssize_t frameLeft) 309 ssize_t frameLeft)
310{ 310{
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-18 05:58:22 -0500