[PATCH] gfp_t: sound
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
@@ -51,7 +51,7 @@ static int snd_seq_gf1_copy_wave_from_stream(snd_gf1_ops_t *ops,
|
||||
gf1_wave_t *wp, *prev;
|
||||
gf1_xwave_t xp;
|
||||
int err;
|
||||
unsigned int gfp_mask;
|
||||
gfp_t gfp_mask;
|
||||
unsigned int real_size;
|
||||
|
||||
gfp_mask = atomic ? GFP_ATOMIC : GFP_KERNEL;
|
||||
@@ -144,7 +144,8 @@ static int snd_seq_gf1_put(void *private_data, snd_seq_kinstr_t *instr,
|
||||
snd_gf1_ops_t *ops = (snd_gf1_ops_t *)private_data;
|
||||
gf1_instrument_t *ip;
|
||||
gf1_xinstrument_t ix;
|
||||
int err, gfp_mask;
|
||||
int err;
|
||||
gfp_t gfp_mask;
|
||||
|
||||
if (cmd != SNDRV_SEQ_INSTR_PUT_CMD_CREATE)
|
||||
return -EINVAL;
|
||||
|
||||
@@ -129,7 +129,7 @@ static int snd_seq_iwffff_copy_wave_from_stream(snd_iwffff_ops_t *ops,
|
||||
iwffff_wave_t *wp, *prev;
|
||||
iwffff_xwave_t xp;
|
||||
int err;
|
||||
unsigned int gfp_mask;
|
||||
gfp_t gfp_mask;
|
||||
unsigned int real_size;
|
||||
|
||||
gfp_mask = atomic ? GFP_ATOMIC : GFP_KERNEL;
|
||||
@@ -236,7 +236,7 @@ static int snd_seq_iwffff_put(void *private_data, snd_seq_kinstr_t *instr,
|
||||
iwffff_layer_t *lp, *prev_lp;
|
||||
iwffff_xlayer_t lx;
|
||||
int err;
|
||||
unsigned int gfp_mask;
|
||||
gfp_t gfp_mask;
|
||||
|
||||
if (cmd != SNDRV_SEQ_INSTR_PUT_CMD_CREATE)
|
||||
return -EINVAL;
|
||||
|
||||
@@ -57,7 +57,8 @@ static int snd_seq_simple_put(void *private_data, snd_seq_kinstr_t *instr,
|
||||
snd_simple_ops_t *ops = (snd_simple_ops_t *)private_data;
|
||||
simple_instrument_t *ip;
|
||||
simple_xinstrument_t ix;
|
||||
int err, gfp_mask;
|
||||
int err;
|
||||
gfp_t gfp_mask;
|
||||
unsigned int real_size;
|
||||
|
||||
if (cmd != SNDRV_SEQ_INSTR_PUT_CMD_CREATE)
|
||||
|
||||
Reference in New Issue
Block a user