Skip to content

Commit 33bf561

Browse files
rddunlapLinus Torvalds
rddunlap
authored and
Linus Torvalds
committed
[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 <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 82006d0 commit 33bf561

File tree

18 files changed

+5
-82
lines changed

18 files changed

+5
-82
lines changed

‎Documentation/feature-removal-schedule.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,6 @@ Who: Greg Kroah-Hartman <[email protected]>
1717

1818
---------------------------
1919

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 <[email protected]>
26-
27-
---------------------------
28-
2920
What: RAW driver (CONFIG_RAW_DRIVER)
3021
When: December 2005
3122
Why: declared obsolete since kernel 2.6.3

‎include/asm-alpha/pgtable.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -339,13 +339,6 @@ extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
339339
#define kern_addr_valid(addr) (1)
340340
#endif
341341

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-
349342
#define io_remap_pfn_range(vma, start, pfn, size, prot) \
350343
remap_pfn_range(vma, start, pfn, size, prot)
351344

‎include/asm-arm/pgtable.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,12 +445,9 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
445445
#define HAVE_ARCH_UNMAPPED_AREA
446446

447447
/*
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'
449449
* into virtual address `from'
450450
*/
451-
#define io_remap_page_range(vma,from,phys,size,prot) \
452-
remap_pfn_range(vma, from, (phys) >> PAGE_SHIFT, size, prot)
453-
454451
#define io_remap_pfn_range(vma,from,pfn,size,prot) \
455452
remap_pfn_range(vma, from, pfn, size, prot)
456453

‎include/asm-arm26/pgtable.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,12 +294,9 @@ static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot)
294294
#include <asm-generic/pgtable.h>
295295

296296
/*
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'
298298
* into virtual address `from'
299299
*/
300-
#define io_remap_page_range(vma,from,phys,size,prot) \
301-
remap_pfn_range(vma, from, (phys) >> PAGE_SHIFT, size, prot)
302-
303300
#define io_remap_pfn_range(vma,from,pfn,size,prot) \
304301
remap_pfn_range(vma, from, pfn, size, prot)
305302

‎include/asm-frv/pgtable.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -500,9 +500,6 @@ static inline int pte_file(pte_t pte)
500500
#define PageSkip(page) (0)
501501
#define kern_addr_valid(addr) (1)
502502

503-
#define io_remap_page_range(vma, vaddr, paddr, size, prot) \
504-
remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
505-
506503
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
507504
remap_pfn_range(vma, vaddr, pfn, size, prot)
508505

‎include/asm-h8300/pgtable.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ extern int is_in_rom(unsigned long);
5252
* No page table caches to initialise
5353
*/
5454
#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)
5755

5856
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
5957
remap_pfn_range(vma, vaddr, pfn, size, prot)

‎include/asm-i386/pgtable.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -431,9 +431,6 @@ extern void noexec_setup(const char *str);
431431
#define kern_addr_valid(addr) (1)
432432
#endif /* CONFIG_FLATMEM */
433433

434-
#define io_remap_page_range(vma, vaddr, paddr, size, prot) \
435-
remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
436-
437434
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
438435
remap_pfn_range(vma, vaddr, pfn, size, prot)
439436

‎include/asm-ia64/pgtable.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -443,10 +443,6 @@ extern void paging_init (void);
443443
#define pte_to_pgoff(pte) ((pte_val(pte) << 1) >> 3)
444444
#define pgoff_to_pte(off) ((pte_t) { ((off) << 2) | _PAGE_FILE })
445445

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-
450446
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
451447
remap_pfn_range(vma, vaddr, pfn, size, prot)
452448

‎include/asm-m32r/pgtable.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -378,9 +378,6 @@ static inline void pmd_set(pmd_t * pmdp, pte_t * ptep)
378378
/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
379379
#define kern_addr_valid(addr) (1)
380380

381-
#define io_remap_page_range(vma, vaddr, paddr, size, prot) \
382-
remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
383-
384381
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
385382
remap_pfn_range(vma, vaddr, pfn, size, prot)
386383

‎include/asm-m68k/pgtable.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,
141141

142142
#define kern_addr_valid(addr) (1)
143143

144-
#define io_remap_page_range(vma, vaddr, paddr, size, prot) \
145-
remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
146-
147144
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
148145
remap_pfn_range(vma, vaddr, pfn, size, prot)
149146

‎include/asm-m68knommu/pgtable.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ extern int is_in_rom(unsigned long);
5656
* No page table caches to initialise.
5757
*/
5858
#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)
6159

6260
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
6361
remap_pfn_range(vma, vaddr, pfn, size, prot)

‎include/asm-mips/pgtable.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -358,16 +358,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,
358358
extern phys_t fixup_bigphys_addr(phys_t phys_addr, phys_t size);
359359
extern int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t prot);
360360

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-
371361
static inline int io_remap_pfn_range(struct vm_area_struct *vma,
372362
unsigned long vaddr,
373363
unsigned long pfn,
@@ -378,8 +368,6 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma,
378368
return remap_pfn_range(vma, vaddr, pfn, size, prot);
379369
}
380370
#else
381-
#define io_remap_page_range(vma, vaddr, paddr, size, prot) \
382-
remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
383371
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
384372
remap_pfn_range(vma, vaddr, pfn, size, prot)
385373
#endif

‎include/asm-parisc/pgtable.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -498,9 +498,6 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
498498

499499
#endif /* !__ASSEMBLY__ */
500500

501-
#define io_remap_page_range(vma, vaddr, paddr, size, prot) \
502-
remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
503-
504501
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
505502
remap_pfn_range(vma, vaddr, pfn, size, prot)
506503

‎include/asm-ppc/pgtable.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -812,15 +812,6 @@ extern void kernel_set_cachemode (unsigned long address, unsigned long size,
812812
#ifdef CONFIG_PHYS_64BIT
813813
extern int remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
814814
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-
}
824815

825816
static inline int io_remap_pfn_range(struct vm_area_struct *vma,
826817
unsigned long vaddr,
@@ -832,8 +823,6 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma,
832823
return remap_pfn_range(vma, vaddr, paddr64 >> PAGE_SHIFT, size, prot);
833824
}
834825
#else
835-
#define io_remap_page_range(vma, vaddr, paddr, size, prot) \
836-
remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
837826
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
838827
remap_pfn_range(vma, vaddr, pfn, size, prot)
839828
#endif

‎include/asm-sh/pgtable.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,6 @@ typedef pte_t *pte_addr_t;
277277

278278
#define kern_addr_valid(addr) (1)
279279

280-
#define io_remap_page_range(vma, vaddr, paddr, size, prot) \
281-
remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
282-
283280
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
284281
remap_pfn_range(vma, vaddr, pfn, size, prot)
285282

‎include/asm-sh64/pgtable.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,9 +482,6 @@ extern void update_mmu_cache(struct vm_area_struct * vma,
482482
#define PageSkip(page) (0)
483483
#define kern_addr_valid(addr) (1)
484484

485-
#define io_remap_page_range(vma, vaddr, paddr, size, prot) \
486-
remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
487-
488485
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
489486
remap_pfn_range(vma, vaddr, pfn, size, prot)
490487

‎include/asm-x86_64/pgtable.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -421,9 +421,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
421421

422422
extern int kern_addr_valid(unsigned long addr);
423423

424-
#define io_remap_page_range(vma, vaddr, paddr, size, prot) \
425-
remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
426-
427424
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
428425
remap_pfn_range(vma, vaddr, pfn, size, prot)
429426

‎include/asm-xtensa/pgtable.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -441,11 +441,11 @@ extern void update_mmu_cache(struct vm_area_struct * vma,
441441
unsigned long address, pte_t pte);
442442

443443
/*
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'
445445
* into virtual address `from'
446446
*/
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)
449449

450450

451451
/* No page table caches to init */

0 commit comments

Comments
 (0)