git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
sound
/
oss
/
dmasound
/
dmasound_q40.c
diff --git
a/sound/oss/dmasound/dmasound_q40.c
b/sound/oss/dmasound/dmasound_q40.c
index
92c25a0
..
e2081f3
100644
(file)
--- a/
sound/oss/dmasound/dmasound_q40.c
+++ b/
sound/oss/dmasound/dmasound_q40.c
@@
-36,7
+36,7
@@
static int expand_data; /* Data for expanding */
/*** Low level stuff *********************************************************/
/*** Low level stuff *********************************************************/
-static void *Q40Alloc(unsigned int size,
in
t flags);
+static void *Q40Alloc(unsigned int size,
gfp_
t flags);
static void Q40Free(void *, unsigned int);
static int Q40IrqInit(void);
#ifdef MODULE
static void Q40Free(void *, unsigned int);
static int Q40IrqInit(void);
#ifdef MODULE
@@
-58,7
+58,7
@@
static void Q40Interrupt(void);
/* userCount, frameUsed, frameLeft == byte counts */
/* userCount, frameUsed, frameLeft == byte counts */
-static ssize_t q40_ct_law(const u_char *userPtr, size_t userCount,
+static ssize_t q40_ct_law(const u_char
__user
*userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
@@
-79,7
+79,7
@@
static ssize_t q40_ct_law(const u_char *userPtr, size_t userCount,
}
}
-static ssize_t q40_ct_s8(const u_char *userPtr, size_t userCount,
+static ssize_t q40_ct_s8(const u_char
__user
*userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
@@
-98,7
+98,7
@@
static ssize_t q40_ct_s8(const u_char *userPtr, size_t userCount,
return used;
}
return used;
}
-static ssize_t q40_ct_u8(const u_char *userPtr, size_t userCount,
+static ssize_t q40_ct_u8(const u_char
__user
*userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
@@
-114,7
+114,7
@@
static ssize_t q40_ct_u8(const u_char *userPtr, size_t userCount,
/* a bit too complicated to optimise right now ..*/
/* a bit too complicated to optimise right now ..*/
-static ssize_t q40_ctx_law(const u_char *userPtr, size_t userCount,
+static ssize_t q40_ctx_law(const u_char
__user
*userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
@@
-152,7
+152,7
@@
static ssize_t q40_ctx_law(const u_char *userPtr, size_t userCount,
}
}
-static ssize_t q40_ctx_s8(const u_char *userPtr, size_t userCount,
+static ssize_t q40_ctx_s8(const u_char
__user
*userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
@@
-189,7
+189,7
@@
static ssize_t q40_ctx_s8(const u_char *userPtr, size_t userCount,
}
}
-static ssize_t q40_ctx_u8(const u_char *userPtr, size_t userCount,
+static ssize_t q40_ctx_u8(const u_char
__user
*userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
@@
-224,7
+224,7
@@
static ssize_t q40_ctx_u8(const u_char *userPtr, size_t userCount,
}
/* compressing versions */
}
/* compressing versions */
-static ssize_t q40_ctc_law(const u_char *userPtr, size_t userCount,
+static ssize_t q40_ctc_law(const u_char
__user
*userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
@@
-265,7
+265,7
@@
static ssize_t q40_ctc_law(const u_char *userPtr, size_t userCount,
}
}
-static ssize_t q40_ctc_s8(const u_char *userPtr, size_t userCount,
+static ssize_t q40_ctc_s8(const u_char
__user
*userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
@@
-304,7
+304,7
@@
static ssize_t q40_ctc_s8(const u_char *userPtr, size_t userCount,
}
}
-static ssize_t q40_ctc_u8(const u_char *userPtr, size_t userCount,
+static ssize_t q40_ctc_u8(const u_char
__user
*userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
u_char frame[], ssize_t *frameUsed,
ssize_t frameLeft)
{
@@
-358,7
+358,7
@@
static TRANS transQ40Compressing = {
/*** Low level stuff *********************************************************/
/*** Low level stuff *********************************************************/
-static void *Q40Alloc(unsigned int size,
in
t flags)
+static void *Q40Alloc(unsigned int size,
gfp_
t flags)
{
return kmalloc(size, flags); /* change to vmalloc */
}
{
return kmalloc(size, flags); /* change to vmalloc */
}