Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv31948/core
Modified Files:
info.c pcm_native.c sound.c
Log Message:
Sync with the 2.6 kernel tree
Index: info.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/info.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- info.c 17 Oct 2003 15:57:36 -0000 1.41
+++ info.c 30 Dec 2003 09:55:04 -0000 1.42
@@ -180,7 +180,7 @@
snd_info_private_data_t *data;
struct snd_info_entry *entry;
snd_info_buffer_t *buf;
- long size = 0;
+ size_t size = 0;
data = snd_magic_cast(snd_info_private_data_t, file->private_data, return
-ENXIO);
snd_assert(data != NULL, return -ENXIO);
@@ -192,7 +192,8 @@
return -EIO;
if (file->f_pos >= (long)buf->size)
return 0;
- size = min(count, (size_t)(buf->size - file->f_pos));
+ size = buf->size - file->f_pos;
+ size = min(count, size);
if (copy_to_user(buffer, buf->buffer + file->f_pos, size))
return -EFAULT;
file->f_pos += size;
@@ -213,7 +214,7 @@
snd_info_private_data_t *data;
struct snd_info_entry *entry;
snd_info_buffer_t *buf;
- long size = 0;
+ size_t size = 0;
data = snd_magic_cast(snd_info_private_data_t, file->private_data, return
-ENXIO);
snd_assert(data != NULL, return -ENXIO);
@@ -227,7 +228,8 @@
return -EINVAL;
if (file->f_pos >= (long)buf->len)
return -ENOMEM;
- size = min(count, (size_t)(buf->len - file->f_pos));
+ size = buf->len - file->f_pos;
+ size = min(count, size);
if (copy_from_user(buf->buffer + file->f_pos, buffer, size))
return -EFAULT;
if ((long)buf->size < file->f_pos + size)
Index: pcm_native.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm_native.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- pcm_native.c 25 Nov 2003 12:01:21 -0000 1.85
+++ pcm_native.c 30 Dec 2003 09:55:04 -0000 1.86
@@ -2828,7 +2828,7 @@
return mask;
}
-static struct page * snd_pcm_mmap_status_nopage(struct vm_area_struct *area, unsigned
long address, int no_share)
+static struct page * snd_pcm_mmap_status_nopage(struct vm_area_struct *area, unsigned
long address, int *type)
{
snd_pcm_substream_t *substream = (snd_pcm_substream_t *)area->vm_private_data;
snd_pcm_runtime_t *runtime;
@@ -2840,6 +2840,8 @@
page = virt_to_page(runtime->status);
if (!PageReserved(page))
get_page(page);
+ if (type)
+ *type = VM_FAULT_MINOR;
return page;
}
@@ -2866,7 +2868,7 @@
return 0;
}
-static struct page * snd_pcm_mmap_control_nopage(struct vm_area_struct *area,
unsigned long address, int no_share)
+static struct page * snd_pcm_mmap_control_nopage(struct vm_area_struct *area,
unsigned long address, int *type)
{
snd_pcm_substream_t *substream = (snd_pcm_substream_t *)area->vm_private_data;
snd_pcm_runtime_t *runtime;
@@ -2878,6 +2880,8 @@
page = virt_to_page(runtime->control);
if (!PageReserved(page))
get_page(page);
+ if (type)
+ *type = VM_FAULT_MINOR;
return page;
}
@@ -2916,7 +2920,7 @@
atomic_dec(&substream->runtime->mmap_count);
}
-static struct page * snd_pcm_mmap_data_nopage(struct vm_area_struct *area, unsigned
long address, int no_share)
+static struct page * snd_pcm_mmap_data_nopage(struct vm_area_struct *area, unsigned
long address, int *type)
{
snd_pcm_substream_t *substream = (snd_pcm_substream_t *)area->vm_private_data;
snd_pcm_runtime_t *runtime;
@@ -2944,6 +2948,8 @@
}
if (!PageReserved(page))
get_page(page);
+ if (type)
+ *type = VM_FAULT_MINOR;
return page;
}
Index: sound.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/sound.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sound.c 31 Oct 2003 11:37:10 -0000 1.54
+++ sound.c 30 Dec 2003 09:55:04 -0000 1.55
@@ -53,6 +53,7 @@
MODULE_PARM(cards_limit, "i");
MODULE_PARM_DESC(cards_limit, "Count of auto-loadable soundcards.");
MODULE_PARM_SYNTAX(cards_limit, "default:8,skill:advanced");
+MODULE_ALIAS_CHARDEV_MAJOR(CONFIG_SND_MAJOR);
#ifdef CONFIG_DEVFS_FS
MODULE_PARM(device_mode, "i");
MODULE_PARM_DESC(device_mode, "Device file permission mask for devfs.");
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
