vserver 1.9.5.x5

[linux-2.6.git] / sound / oss / dmabuf.c

diff --git a/sound/oss/dmabuf.c b/sound/oss/dmabuf.c
index 73aa190..baf4244 100644 (file)
--- a/sound/oss/dmabuf.c
+++ b/sound/oss/dmabuf.c
@@ -88,7 +88,7 @@ static int sound_alloc_dmap(struct dma_buffparms *dmap)
        while (start_addr == NULL && dmap->buffsize > PAGE_SIZE) {
                for (sz = 0, size = PAGE_SIZE; size < dmap->buffsize; sz++, size <<= 1);
                dmap->buffsize = PAGE_SIZE * (1 << sz);
-               start_addr = (char *) __get_free_pages(GFP_ATOMIC|GFP_DMA, sz);
+               start_addr = (char *) __get_free_pages(GFP_ATOMIC|GFP_DMA|__GFP_NOWARN, sz);
                if (start_addr == NULL)
                        dmap->buffsize /= 2;
        }
@@ -236,7 +236,7 @@ static unsigned int default_set_bits(int dev, unsigned int bits)
        mm_segment_t fs = get_fs();
 
        set_fs(get_ds());
-       audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_SETFMT, (caddr_t)&bits);
+       audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_SETFMT, (void __user *)&bits);
        set_fs(fs);
        return bits;
 }
@@ -246,7 +246,7 @@ static int default_set_speed(int dev, int speed)
        mm_segment_t fs = get_fs();
 
        set_fs(get_ds());
-       audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_SPEED, (caddr_t)&speed);
+       audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_SPEED, (void __user *)&speed);
        set_fs(fs);
        return speed;
 }
@@ -257,7 +257,7 @@ static short default_set_channels(int dev, short channels)
        mm_segment_t fs = get_fs();
 
        set_fs(get_ds());
-       audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_CHANNELS, (caddr_t)&c);
+       audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_CHANNELS, (void __user *)&c);
        set_fs(fs);
        return c;
 }