tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] feature removal of io_remap_page_range()

As written in Documentation/feature-removal-schedule.txt, remove the
io_remap_page_range() kernel API.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Randy Dunlap and committed by
Linus Torvalds 33bf5610 82006d08

+5 -82
-9
Documentation/feature-removal-schedule.txt
··· 17 17 18 18 --------------------------- 19 19 20 - What: io_remap_page_range() (macro or function) 21 - When: September 2005 22 - Why: Replaced by io_remap_pfn_range() which allows more memory space 23 - addressabilty (by using a pfn) and supports sparc & sparc64 24 - iospace as part of the pfn. 25 - Who: Randy Dunlap <rddunlap@osdl.org> 26 - 27 - --------------------------- 28 - 29 20 What: RAW driver (CONFIG_RAW_DRIVER) 30 21 When: December 2005 31 22 Why: declared obsolete since kernel 2.6.3
-7
include/asm-alpha/pgtable.h
··· 339 339 #define kern_addr_valid(addr) (1) 340 340 #endif 341 341 342 - #define io_remap_page_range(vma, start, busaddr, size, prot) \ 343 - ({ \ 344 - void *va = (void __force *)ioremap(busaddr, size); \ 345 - unsigned long pfn = virt_to_phys(va) >> PAGE_SHIFT; \ 346 - remap_pfn_range(vma, start, pfn, size, prot); \ 347 - }) 348 - 349 342 #define io_remap_pfn_range(vma, start, pfn, size, prot) \ 350 343 remap_pfn_range(vma, start, pfn, size, prot) 351 344
+1 -4
include/asm-arm/pgtable.h
··· 445 445 #define HAVE_ARCH_UNMAPPED_AREA 446 446 447 447 /* 448 - * remap a physical address `phys' of size `size' with page protection `prot' 448 + * remap a physical page `pfn' of size `size' with page protection `prot' 449 449 * into virtual address `from' 450 450 */ 451 - #define io_remap_page_range(vma,from,phys,size,prot) \ 452 - remap_pfn_range(vma, from, (phys) >> PAGE_SHIFT, size, prot) 453 - 454 451 #define io_remap_pfn_range(vma,from,pfn,size,prot) \ 455 452 remap_pfn_range(vma, from, pfn, size, prot) 456 453
+1 -4
include/asm-arm26/pgtable.h
··· 294 294 #include <asm-generic/pgtable.h> 295 295 296 296 /* 297 - * remap a physical address `phys' of size `size' with page protection `prot' 297 + * remap a physical page `pfn' of size `size' with page protection `prot' 298 298 * into virtual address `from' 299 299 */ 300 - #define io_remap_page_range(vma,from,phys,size,prot) \ 301 - remap_pfn_range(vma, from, (phys) >> PAGE_SHIFT, size, prot) 302 - 303 300 #define io_remap_pfn_range(vma,from,pfn,size,prot) \ 304 301 remap_pfn_range(vma, from, pfn, size, prot) 305 302
-3
include/asm-frv/pgtable.h
··· 500 500 #define PageSkip(page) (0) 501 501 #define kern_addr_valid(addr) (1) 502 502 503 - #define io_remap_page_range(vma, vaddr, paddr, size, prot) \ 504 - remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) 505 - 506 503 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ 507 504 remap_pfn_range(vma, vaddr, pfn, size, prot) 508 505
-2
include/asm-h8300/pgtable.h
··· 52 52 * No page table caches to initialise 53 53 */ 54 54 #define pgtable_cache_init() do { } while (0) 55 - #define io_remap_page_range(vma, vaddr, paddr, size, prot) \ 56 - remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) 57 55 58 56 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ 59 57 remap_pfn_range(vma, vaddr, pfn, size, prot)
-3
include/asm-i386/pgtable.h
··· 431 431 #define kern_addr_valid(addr) (1) 432 432 #endif /* CONFIG_FLATMEM */ 433 433 434 - #define io_remap_page_range(vma, vaddr, paddr, size, prot) \ 435 - remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) 436 - 437 434 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ 438 435 remap_pfn_range(vma, vaddr, pfn, size, prot) 439 436
-4
include/asm-ia64/pgtable.h
··· 443 443 #define pte_to_pgoff(pte) ((pte_val(pte) << 1) >> 3) 444 444 #define pgoff_to_pte(off) ((pte_t) { ((off) << 2) | _PAGE_FILE }) 445 445 446 - /* XXX is this right? */ 447 - #define io_remap_page_range(vma, vaddr, paddr, size, prot) \ 448 - remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) 449 - 450 446 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ 451 447 remap_pfn_range(vma, vaddr, pfn, size, prot) 452 448
-3
include/asm-m32r/pgtable.h
··· 378 378 /* Needs to be defined here and not in linux/mm.h, as it is arch dependent */ 379 379 #define kern_addr_valid(addr) (1) 380 380 381 - #define io_remap_page_range(vma, vaddr, paddr, size, prot) \ 382 - remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) 383 - 384 381 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ 385 382 remap_pfn_range(vma, vaddr, pfn, size, prot) 386 383
-3
include/asm-m68k/pgtable.h
··· 141 141 142 142 #define kern_addr_valid(addr) (1) 143 143 144 - #define io_remap_page_range(vma, vaddr, paddr, size, prot) \ 145 - remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) 146 - 147 144 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ 148 145 remap_pfn_range(vma, vaddr, pfn, size, prot) 149 146
-2
include/asm-m68knommu/pgtable.h
··· 56 56 * No page table caches to initialise. 57 57 */ 58 58 #define pgtable_cache_init() do { } while (0) 59 - #define io_remap_page_range(vma, vaddr, paddr, size, prot) \ 60 - remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) 61 59 62 60 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ 63 61 remap_pfn_range(vma, vaddr, pfn, size, prot)
-12
include/asm-mips/pgtable.h
··· 358 358 extern phys_t fixup_bigphys_addr(phys_t phys_addr, phys_t size); 359 359 extern int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t prot); 360 360 361 - static inline int io_remap_page_range(struct vm_area_struct *vma, 362 - unsigned long vaddr, 363 - unsigned long paddr, 364 - unsigned long size, 365 - pgprot_t prot) 366 - { 367 - phys_t phys_addr_high = fixup_bigphys_addr(paddr, size); 368 - return remap_pfn_range(vma, vaddr, phys_addr_high >> PAGE_SHIFT, size, prot); 369 - } 370 - 371 361 static inline int io_remap_pfn_range(struct vm_area_struct *vma, 372 362 unsigned long vaddr, 373 363 unsigned long pfn, ··· 368 378 return remap_pfn_range(vma, vaddr, pfn, size, prot); 369 379 } 370 380 #else 371 - #define io_remap_page_range(vma, vaddr, paddr, size, prot) \ 372 - remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) 373 381 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ 374 382 remap_pfn_range(vma, vaddr, pfn, size, prot) 375 383 #endif
-3
include/asm-parisc/pgtable.h
··· 498 498 499 499 #endif /* !__ASSEMBLY__ */ 500 500 501 - #define io_remap_page_range(vma, vaddr, paddr, size, prot) \ 502 - remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) 503 - 504 501 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ 505 502 remap_pfn_range(vma, vaddr, pfn, size, prot) 506 503
-11
include/asm-ppc/pgtable.h
··· 812 812 #ifdef CONFIG_PHYS_64BIT 813 813 extern int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, 814 814 unsigned long paddr, unsigned long size, pgprot_t prot); 815 - static inline int io_remap_page_range(struct vm_area_struct *vma, 816 - unsigned long vaddr, 817 - unsigned long paddr, 818 - unsigned long size, 819 - pgprot_t prot) 820 - { 821 - phys_addr_t paddr64 = fixup_bigphys_addr(paddr, size); 822 - return remap_pfn_range(vma, vaddr, paddr64 >> PAGE_SHIFT, size, prot); 823 - } 824 815 825 816 static inline int io_remap_pfn_range(struct vm_area_struct *vma, 826 817 unsigned long vaddr, ··· 823 832 return remap_pfn_range(vma, vaddr, paddr64 >> PAGE_SHIFT, size, prot); 824 833 } 825 834 #else 826 - #define io_remap_page_range(vma, vaddr, paddr, size, prot) \ 827 - remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) 828 835 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ 829 836 remap_pfn_range(vma, vaddr, pfn, size, prot) 830 837 #endif
-3
include/asm-sh/pgtable.h
··· 277 277 278 278 #define kern_addr_valid(addr) (1) 279 279 280 - #define io_remap_page_range(vma, vaddr, paddr, size, prot) \ 281 - remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) 282 - 283 280 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ 284 281 remap_pfn_range(vma, vaddr, pfn, size, prot) 285 282
-3
include/asm-sh64/pgtable.h
··· 482 482 #define PageSkip(page) (0) 483 483 #define kern_addr_valid(addr) (1) 484 484 485 - #define io_remap_page_range(vma, vaddr, paddr, size, prot) \ 486 - remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) 487 - 488 485 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ 489 486 remap_pfn_range(vma, vaddr, pfn, size, prot) 490 487
-3
include/asm-x86_64/pgtable.h
··· 421 421 422 422 extern int kern_addr_valid(unsigned long addr); 423 423 424 - #define io_remap_page_range(vma, vaddr, paddr, size, prot) \ 425 - remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) 426 - 427 424 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ 428 425 remap_pfn_range(vma, vaddr, pfn, size, prot) 429 426
+3 -3
include/asm-xtensa/pgtable.h
··· 441 441 unsigned long address, pte_t pte); 442 442 443 443 /* 444 - * remap a physical address `phys' of size `size' with page protection `prot' 444 + * remap a physical page `pfn' of size `size' with page protection `prot' 445 445 * into virtual address `from' 446 446 */ 447 - #define io_remap_page_range(vma,from,phys,size,prot) \ 448 - remap_pfn_range(vma, from, (phys) >> PAGE_SHIFT, size, prot) 447 + #define io_remap_pfn_range(vma,from,pfn,size,prot) \ 448 + remap_pfn_range(vma, from, pfn, size, prot) 449 449 450 450 451 451 /* No page table caches to init */