X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Foss%2Fsoundcard.c;h=e878a971251b9bb5d1202a9ed7430cd45b1b39dd;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=7e228966eca926ba766fc61b755a68781bab8209;hpb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;p=linux-2.6.git

diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index 7e228966e..e878a9712 100644
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -127,7 +127,7 @@ static int get_mixer_levels(void __user * arg)
 {
 	int n;
 
-	if (__get_user(n, (int __user *)(&(((mixer_vol_table *__user )arg)->num))))
+	if (__get_user(n, (int __user *)(&(((mixer_vol_table __user *)arg)->num))))
 		return -EFAULT;
 	if (n < 0 || n >= num_mixer_volumes)
 		return -EINVAL;
@@ -463,9 +463,9 @@ static int sound_mmap(struct file *file, struct vm_area_struct *vma)
 	if (size != dmap->bytes_in_use) {
 		printk(KERN_WARNING "Sound: mmap() size = %ld. Should be %d\n", size, dmap->bytes_in_use);
 	}
-	if (remap_page_range(vma, vma->vm_start, virt_to_phys(dmap->raw_buf),
-		vma->vm_end - vma->vm_start,
-		vma->vm_page_prot)) {
+	if (remap_pfn_range(vma, vma->vm_start,
+			virt_to_phys(dmap->raw_buf) >> PAGE_SHIFT,
+			vma->vm_end - vma->vm_start, vma->vm_page_prot)) {
 		unlock_kernel();
 		return -EAGAIN;
 	}
@@ -535,8 +535,8 @@ static const struct {
 static int dmabuf;
 static int dmabug;
 
-MODULE_PARM(dmabuf, "i");
-MODULE_PARM(dmabug, "i");
+module_param(dmabuf, int, 0444);
+module_param(dmabug, int, 0444);
 
 static int __init oss_init(void)
 {