Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 18131
b: refs/heads/master
c: 031eb4c
h: refs/heads/master
i:
  18129: d9b3c97
  18127: f5d9ebe
v: v3
  • Loading branch information
Al Viro authored and Linus Torvalds committed Jan 12, 2006
1 parent 139498c commit 1018492
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 61 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d998265feb7cbcf74e27e3057dac309dcad47bf7
refs/heads/master: 031eb4cddec7a4825212ece47de4bd64cd8e0bee
94 changes: 47 additions & 47 deletions trunk/sound/oss/dmasound/dmasound_atari.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,46 +67,46 @@ static int expand_data; /* Data for expanding */
* ++geert: split in even more functions (one per format)
*/

static ssize_t ata_ct_law(const u_char *userPtr, size_t userCount,
static ssize_t ata_ct_law(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft);
static ssize_t ata_ct_s8(const u_char *userPtr, size_t userCount,
static ssize_t ata_ct_s8(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft);
static ssize_t ata_ct_u8(const u_char *userPtr, size_t userCount,
static ssize_t ata_ct_u8(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft);
static ssize_t ata_ct_s16be(const u_char *userPtr, size_t userCount,
static ssize_t ata_ct_s16be(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft);
static ssize_t ata_ct_u16be(const u_char *userPtr, size_t userCount,
static ssize_t ata_ct_u16be(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft);
static ssize_t ata_ct_s16le(const u_char *userPtr, size_t userCount,
static ssize_t ata_ct_s16le(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft);
static ssize_t ata_ct_u16le(const u_char *userPtr, size_t userCount,
static ssize_t ata_ct_u16le(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft);
static ssize_t ata_ctx_law(const u_char *userPtr, size_t userCount,
static ssize_t ata_ctx_law(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft);
static ssize_t ata_ctx_s8(const u_char *userPtr, size_t userCount,
static ssize_t ata_ctx_s8(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft);
static ssize_t ata_ctx_u8(const u_char *userPtr, size_t userCount,
static ssize_t ata_ctx_u8(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft);
static ssize_t ata_ctx_s16be(const u_char *userPtr, size_t userCount,
static ssize_t ata_ctx_s16be(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft);
static ssize_t ata_ctx_u16be(const u_char *userPtr, size_t userCount,
static ssize_t ata_ctx_u16be(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft);
static ssize_t ata_ctx_s16le(const u_char *userPtr, size_t userCount,
static ssize_t ata_ctx_s16le(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft);
static ssize_t ata_ctx_u16le(const u_char *userPtr, size_t userCount,
static ssize_t ata_ctx_u16le(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft);

Expand Down Expand Up @@ -151,7 +151,7 @@ static int FalconStateInfo(char *buffer, size_t space);
/*** Translations ************************************************************/


static ssize_t ata_ct_law(const u_char *userPtr, size_t userCount,
static ssize_t ata_ct_law(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
Expand All @@ -176,7 +176,7 @@ static ssize_t ata_ct_law(const u_char *userPtr, size_t userCount,
}


static ssize_t ata_ct_s8(const u_char *userPtr, size_t userCount,
static ssize_t ata_ct_s8(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
Expand All @@ -194,7 +194,7 @@ static ssize_t ata_ct_s8(const u_char *userPtr, size_t userCount,
}


static ssize_t ata_ct_u8(const u_char *userPtr, size_t userCount,
static ssize_t ata_ct_u8(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
Expand All @@ -217,7 +217,7 @@ static ssize_t ata_ct_u8(const u_char *userPtr, size_t userCount,
used = count*2;
while (count > 0) {
u_short data;
if (get_user(data, (u_short *)userPtr))
if (get_user(data, (u_short __user *)userPtr))
return -EFAULT;
userPtr += 2;
*p++ = data ^ 0x8080;
Expand All @@ -229,7 +229,7 @@ static ssize_t ata_ct_u8(const u_char *userPtr, size_t userCount,
}


static ssize_t ata_ct_s16be(const u_char *userPtr, size_t userCount,
static ssize_t ata_ct_s16be(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
Expand All @@ -241,7 +241,7 @@ static ssize_t ata_ct_s16be(const u_char *userPtr, size_t userCount,
used = count*2;
while (count > 0) {
u_short data;
if (get_user(data, (u_short *)userPtr))
if (get_user(data, (u_short __user *)userPtr))
return -EFAULT;
userPtr += 2;
*p++ = data;
Expand All @@ -261,7 +261,7 @@ static ssize_t ata_ct_s16be(const u_char *userPtr, size_t userCount,
}


static ssize_t ata_ct_u16be(const u_char *userPtr, size_t userCount,
static ssize_t ata_ct_u16be(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
Expand All @@ -273,7 +273,7 @@ static ssize_t ata_ct_u16be(const u_char *userPtr, size_t userCount,
used = count*2;
while (count > 0) {
u_short data;
if (get_user(data, (u_short *)userPtr))
if (get_user(data, (u_short __user *)userPtr))
return -EFAULT;
userPtr += 2;
data ^= 0x8000;
Expand All @@ -287,8 +287,8 @@ static ssize_t ata_ct_u16be(const u_char *userPtr, size_t userCount,
count = min_t(unsigned long, userCount, frameLeft)>>2;
used = count*4;
while (count > 0) {
u_long data;
if (get_user(data, (u_int *)userPtr))
u_int data;
if (get_user(data, (u_int __user *)userPtr))
return -EFAULT;
userPtr += 4;
*p++ = data ^ 0x80008000;
Expand All @@ -300,7 +300,7 @@ static ssize_t ata_ct_u16be(const u_char *userPtr, size_t userCount,
}


static ssize_t ata_ct_s16le(const u_char *userPtr, size_t userCount,
static ssize_t ata_ct_s16le(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
Expand All @@ -313,7 +313,7 @@ static ssize_t ata_ct_s16le(const u_char *userPtr, size_t userCount,
used = count*2;
while (count > 0) {
u_short data;
if (get_user(data, (u_short *)userPtr))
if (get_user(data, (u_short __user *)userPtr))
return -EFAULT;
userPtr += 2;
data = le2be16(data);
Expand All @@ -328,7 +328,7 @@ static ssize_t ata_ct_s16le(const u_char *userPtr, size_t userCount,
used = count*4;
while (count > 0) {
u_long data;
if (get_user(data, (u_int *)userPtr))
if (get_user(data, (u_int __user *)userPtr))
return -EFAULT;
userPtr += 4;
data = le2be16dbl(data);
Expand All @@ -341,7 +341,7 @@ static ssize_t ata_ct_s16le(const u_char *userPtr, size_t userCount,
}


static ssize_t ata_ct_u16le(const u_char *userPtr, size_t userCount,
static ssize_t ata_ct_u16le(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
Expand All @@ -354,7 +354,7 @@ static ssize_t ata_ct_u16le(const u_char *userPtr, size_t userCount,
used = count*2;
while (count > 0) {
u_short data;
if (get_user(data, (u_short *)userPtr))
if (get_user(data, (u_short __user *)userPtr))
return -EFAULT;
userPtr += 2;
data = le2be16(data) ^ 0x8000;
Expand All @@ -368,7 +368,7 @@ static ssize_t ata_ct_u16le(const u_char *userPtr, size_t userCount,
used = count;
while (count > 0) {
u_long data;
if (get_user(data, (u_int *)userPtr))
if (get_user(data, (u_int __user *)userPtr))
return -EFAULT;
userPtr += 4;
data = le2be16dbl(data) ^ 0x80008000;
Expand All @@ -381,7 +381,7 @@ static ssize_t ata_ct_u16le(const u_char *userPtr, size_t userCount,
}


static ssize_t ata_ctx_law(const u_char *userPtr, size_t userCount,
static ssize_t ata_ctx_law(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
Expand Down Expand Up @@ -443,7 +443,7 @@ static ssize_t ata_ctx_law(const u_char *userPtr, size_t userCount,
}


static ssize_t ata_ctx_s8(const u_char *userPtr, size_t userCount,
static ssize_t ata_ctx_s8(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
Expand Down Expand Up @@ -478,7 +478,7 @@ static ssize_t ata_ctx_s8(const u_char *userPtr, size_t userCount,
if (bal < 0) {
if (userCount < 2)
break;
if (get_user(data, (u_short *)userPtr))
if (get_user(data, (u_short __user *)userPtr))
return -EFAULT;
userPtr += 2;
userCount -= 2;
Expand All @@ -497,7 +497,7 @@ static ssize_t ata_ctx_s8(const u_char *userPtr, size_t userCount,
}


static ssize_t ata_ctx_u8(const u_char *userPtr, size_t userCount,
static ssize_t ata_ctx_u8(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
Expand Down Expand Up @@ -533,7 +533,7 @@ static ssize_t ata_ctx_u8(const u_char *userPtr, size_t userCount,
if (bal < 0) {
if (userCount < 2)
break;
if (get_user(data, (u_short *)userPtr))
if (get_user(data, (u_short __user *)userPtr))
return -EFAULT;
userPtr += 2;
data ^= 0x8080;
Expand All @@ -553,7 +553,7 @@ static ssize_t ata_ctx_u8(const u_char *userPtr, size_t userCount,
}


static ssize_t ata_ctx_s16be(const u_char *userPtr, size_t userCount,
static ssize_t ata_ctx_s16be(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
Expand All @@ -571,7 +571,7 @@ static ssize_t ata_ctx_s16be(const u_char *userPtr, size_t userCount,
if (bal < 0) {
if (userCount < 2)
break;
if (get_user(data, (u_short *)userPtr))
if (get_user(data, (u_short __user *)userPtr))
return -EFAULT;
userPtr += 2;
userCount -= 2;
Expand All @@ -590,7 +590,7 @@ static ssize_t ata_ctx_s16be(const u_char *userPtr, size_t userCount,
if (bal < 0) {
if (userCount < 4)
break;
if (get_user(data, (u_int *)userPtr))
if (get_user(data, (u_int __user *)userPtr))
return -EFAULT;
userPtr += 4;
userCount -= 4;
Expand All @@ -609,7 +609,7 @@ static ssize_t ata_ctx_s16be(const u_char *userPtr, size_t userCount,
}


static ssize_t ata_ctx_u16be(const u_char *userPtr, size_t userCount,
static ssize_t ata_ctx_u16be(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
Expand All @@ -627,7 +627,7 @@ static ssize_t ata_ctx_u16be(const u_char *userPtr, size_t userCount,
if (bal < 0) {
if (userCount < 2)
break;
if (get_user(data, (u_short *)userPtr))
if (get_user(data, (u_short __user *)userPtr))
return -EFAULT;
userPtr += 2;
data ^= 0x8000;
Expand All @@ -647,7 +647,7 @@ static ssize_t ata_ctx_u16be(const u_char *userPtr, size_t userCount,
if (bal < 0) {
if (userCount < 4)
break;
if (get_user(data, (u_int *)userPtr))
if (get_user(data, (u_int __user *)userPtr))
return -EFAULT;
userPtr += 4;
data ^= 0x80008000;
Expand All @@ -667,7 +667,7 @@ static ssize_t ata_ctx_u16be(const u_char *userPtr, size_t userCount,
}


static ssize_t ata_ctx_s16le(const u_char *userPtr, size_t userCount,
static ssize_t ata_ctx_s16le(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
Expand All @@ -685,7 +685,7 @@ static ssize_t ata_ctx_s16le(const u_char *userPtr, size_t userCount,
if (bal < 0) {
if (userCount < 2)
break;
if (get_user(data, (u_short *)userPtr))
if (get_user(data, (u_short __user *)userPtr))
return -EFAULT;
userPtr += 2;
data = le2be16(data);
Expand All @@ -705,7 +705,7 @@ static ssize_t ata_ctx_s16le(const u_char *userPtr, size_t userCount,
if (bal < 0) {
if (userCount < 4)
break;
if (get_user(data, (u_int *)userPtr))
if (get_user(data, (u_int __user *)userPtr))
return -EFAULT;
userPtr += 4;
data = le2be16dbl(data);
Expand All @@ -725,7 +725,7 @@ static ssize_t ata_ctx_s16le(const u_char *userPtr, size_t userCount,
}


static ssize_t ata_ctx_u16le(const u_char *userPtr, size_t userCount,
static ssize_t ata_ctx_u16le(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
Expand All @@ -743,7 +743,7 @@ static ssize_t ata_ctx_u16le(const u_char *userPtr, size_t userCount,
if (bal < 0) {
if (userCount < 2)
break;
if (get_user(data, (u_short *)userPtr))
if (get_user(data, (u_short __user *)userPtr))
return -EFAULT;
userPtr += 2;
data = le2be16(data) ^ 0x8000;
Expand All @@ -763,7 +763,7 @@ static ssize_t ata_ctx_u16le(const u_char *userPtr, size_t userCount,
if (bal < 0) {
if (userCount < 4)
break;
if (get_user(data, (u_int *)userPtr))
if (get_user(data, (u_int __user *)userPtr))
return -EFAULT;
userPtr += 4;
data = le2be16dbl(data) ^ 0x80008000;
Expand Down
8 changes: 4 additions & 4 deletions trunk/sound/oss/dmasound/dmasound_paula.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ static int AmiStateInfo(char *buffer, size_t space);
* Native format
*/

static ssize_t ami_ct_s8(const u_char *userPtr, size_t userCount,
static ssize_t ami_ct_s8(const u_char __user *userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed, ssize_t frameLeft)
{
ssize_t count, used;
Expand Down Expand Up @@ -190,7 +190,7 @@ static ssize_t ami_ct_s8(const u_char *userPtr, size_t userCount,
*/

#define GENERATE_AMI_CT8(funcname, convsample) \
static ssize_t funcname(const u_char *userPtr, size_t userCount, \
static ssize_t funcname(const u_char __user *userPtr, size_t userCount, \
u_char frame[], ssize_t *frameUsed, \
ssize_t frameLeft) \
{ \
Expand Down Expand Up @@ -241,11 +241,11 @@ GENERATE_AMI_CT8(ami_ct_u8, AMI_CT_U8)
*/

#define GENERATE_AMI_CT_16(funcname, convsample) \
static ssize_t funcname(const u_char *userPtr, size_t userCount, \
static ssize_t funcname(const u_char __user *userPtr, size_t userCount, \
u_char frame[], ssize_t *frameUsed, \
ssize_t frameLeft) \
{ \
const u_short *ptr = (const u_short *)userPtr; \
const u_short __user *ptr = (const u_short __user *)userPtr; \
ssize_t count, used; \
u_short data; \
\
Expand Down
Loading

0 comments on commit 1018492

Please sign in to comment.