diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 05:30:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 05:30:00 +0000 |
| commit | ee355114ec6062d00c1376b184b886a39e74fd4e (patch) | |
| tree | da9330872894208b121ac18e2abbc801b67f1509 /drivers/sound | |
| parent | d1003cbd87479d4962fe017c0f913dde9c4d026a (diff) | |
Merge with Linux 2.4.0-test6-pre9.
Diffstat (limited to 'drivers/sound')
| -rw-r--r-- | drivers/sound/dmabuf.c | 5 | ||||
| -rw-r--r-- | drivers/sound/sscape.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/sound/dmabuf.c b/drivers/sound/dmabuf.c index c11c1fe73..b46d4e086 100644 --- a/drivers/sound/dmabuf.c +++ b/drivers/sound/dmabuf.c @@ -26,6 +26,7 @@ #define SAMPLE_ROUNDUP 0 #include "sound_config.h" +#include <linux/wrapper.h> #define DMAP_FREE_ON_CLOSE 0 #define DMAP_KEEP_ON_CLOSE 1 @@ -114,7 +115,7 @@ static int sound_alloc_dmap(struct dma_buffparms *dmap) dmap->raw_buf = start_addr; dmap->raw_buf_phys = virt_to_bus(start_addr); - for (page = virt_to_page(start_addr); page <= get_mem_map(end_addr); page++) + for (page = virt_to_page(start_addr); page <= virt_to_page(end_addr); page++) mem_map_reserve(page); return 0; } @@ -134,7 +135,7 @@ static void sound_free_dmap(struct dma_buffparms *dmap) start_addr = (unsigned long) dmap->raw_buf; end_addr = start_addr + dmap->buffsize; - for (page = virt_to_page(start_addr); page <= get_mem_map(end_addr); page++) + for (page = virt_to_page(start_addr); page <= virt_to_page(end_addr); page++) mem_map_unreserve(page); free_pages((unsigned long) dmap->raw_buf, sz); diff --git a/drivers/sound/sscape.c b/drivers/sound/sscape.c index e953aac6f..21fd2ea2e 100644 --- a/drivers/sound/sscape.c +++ b/drivers/sound/sscape.c @@ -38,6 +38,7 @@ #include <linux/ioport.h> #include <linux/delay.h> #include <linux/proc_fs.h> +#include <linux/wrapper.h> #include "coproc.h" @@ -849,7 +850,7 @@ static int sscape_alloc_dma(sscape_info *devc) devc->raw_buf = start_addr; devc->raw_buf_phys = virt_to_bus(start_addr); - for (page = virt_to_page(start_addr); page <= get_mem_map(end_addr); page++) + for (page = virt_to_page(start_addr); page <= virt_to_page(end_addr); page++) mem_map_reserve(page); return 1; } @@ -865,7 +866,7 @@ static void sscape_free_dma(sscape_info *devc) start_addr = (unsigned long) devc->raw_buf; end_addr = start_addr + devc->buffsize; - for (page = virt_to_page(start_addr); page <= get_mem_map(end_addr); page++) + for (page = virt_to_page(start_addr); page <= virt_to_page(end_addr); page++) mem_map_unreserve(page); free_pages((unsigned long) devc->raw_buf, sz); |