diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
| commit | 8624512aa908741ba2795200133eae0d7f4557ea (patch) | |
| tree | d5d3036fccf2604f4c98dedc11e8adb929d6b52e /arch/arm | |
| parent | 7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff) | |
Merge with 2.3.48.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/armksyms.c | 1 | ||||
| -rw-r--r-- | arch/arm/mm/consistent.c | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index 63d4631a4..c445daeee 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c @@ -165,7 +165,6 @@ EXPORT_SYMBOL_NOVERS(strncmp); EXPORT_SYMBOL_NOVERS(strchr); EXPORT_SYMBOL_NOVERS(strlen); EXPORT_SYMBOL_NOVERS(strnlen); -EXPORT_SYMBOL_NOVERS(strspn); EXPORT_SYMBOL_NOVERS(strpbrk); EXPORT_SYMBOL_NOVERS(strtok); EXPORT_SYMBOL_NOVERS(strrchr); diff --git a/arch/arm/mm/consistent.c b/arch/arm/mm/consistent.c index 8673d6c1d..7101b2936 100644 --- a/arch/arm/mm/consistent.c +++ b/arch/arm/mm/consistent.c @@ -23,7 +23,6 @@ void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle) { int order; unsigned long page; - struct vm_struct *area; void *ret; if (in_interrupt()) @@ -40,15 +39,10 @@ void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle) *dma_handle = virt_to_bus((void *)page); - area = get_vm_area(size, VM_IOREMAP); /* maybe new type? */ - if (!area) - goto no_area; - ret = __ioremap(virt_to_phys((void *)page), PAGE_SIZE << order, 0); if (ret) return ret; -no_area: free_pages(page, order); no_page: BUG(); |