Update of /cvsroot/alsa/alsa-kernel/pci/emu10k1
In directory sc8-pr-cvs1:/tmp/cvs-serv30321/pci/emu10k1
Modified Files:
emu10k1_patch.c emu10k1_synth_local.h memory.c
Log Message:
- added __user prefix to the user-space pointers.
Index: emu10k1_patch.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emu10k1_patch.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- emu10k1_patch.c 12 Aug 2002 08:43:47 -0000 1.4
+++ emu10k1_patch.c 16 Jan 2004 18:02:40 -0000 1.5
@@ -36,7 +36,7 @@
*/
int
snd_emu10k1_sample_new(snd_emux_t *rec, snd_sf_sample_t *sp,
- snd_util_memhdr_t *hdr, const void *data, long count)
+ snd_util_memhdr_t *hdr, const void __user *data, long count)
{
int offset;
int truesize, size, loopsize, blocksize;
Index: emu10k1_synth_local.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emu10k1_synth_local.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- emu10k1_synth_local.h 14 Feb 2002 17:40:33 -0000 1.4
+++ emu10k1_synth_local.h 16 Jan 2004 18:02:40 -0000 1.5
@@ -26,7 +26,7 @@
#include <sound/emu10k1_synth.h>
/* emu10k1_patch.c */
-int snd_emu10k1_sample_new(snd_emux_t *private_data, snd_sf_sample_t *sp,
snd_util_memhdr_t *hdr, const void *_data, long count);
+int snd_emu10k1_sample_new(snd_emux_t *private_data, snd_sf_sample_t *sp,
snd_util_memhdr_t *hdr, const void __user *_data, long count);
int snd_emu10k1_sample_free(snd_emux_t *private_data, snd_sf_sample_t *sp,
snd_util_memhdr_t *hdr);
int snd_emu10k1_memhdr_init(snd_emux_t *emu);
Index: memory.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/memory.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- memory.c 10 Mar 2003 12:54:47 -0000 1.13
+++ memory.c 16 Jan 2004 18:02:40 -0000 1.14
@@ -529,7 +529,7 @@
/*
* copy_from_user(blk + offset, data, size)
*/
-int snd_emu10k1_synth_copy_from_user(emu10k1_t *emu, snd_util_memblk_t *blk, int
offset, const char *data, int size)
+int snd_emu10k1_synth_copy_from_user(emu10k1_t *emu, snd_util_memblk_t *blk, int
offset, const char __user *data, int size)
{
int page, nextofs, end_offset, temp, temp1;
void *ptr;
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
