[SPARC]: Kill io_remap_page_range()

It's been deprecated long enough and there are no in-tree users any longer. Signed-off-by: David S. Miller <davem@davemloft.net>

[SPARC]: Kill io_remap_page_range()
It's been deprecated long enough and there are no in-tree users any longer. Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller
1 parent 8a36895c0d
Showing 7 changed files with 1 additions and 100 deletions Side-by-side Diff
arch/sparc/kernel/sparc_ksyms.c
arch/sparc/mm/generic.c
arch/sparc64/kernel/pci.c
arch/sparc64/kernel/sparc64_ksyms.c
arch/sparc64/mm/generic.c
include/asm-sparc/pgtable.h
include/asm-sparc64/pgtable.h
@@ -175,7 +175,6 @@
 EXPORT_SYMBOL(get_auxio);
 #endif
 EXPORT_SYMBOL(request_fast_irq);
-EXPORT_SYMBOL(io_remap_page_range);
 EXPORT_SYMBOL(io_remap_pfn_range);
   /* P3: iounit_xxx may be needed, sun4d users */
 /* EXPORT_SYMBOL(iounit_map_dma_init); */
@@ -16,31 +16,6 @@
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
  
-static inline void forget_pte(pte_t page)
-{
-#if 0 /* old 2.4 code */
-	if (pte_none(page))
-		return;
-	if (pte_present(page)) {
-		unsigned long pfn = pte_pfn(page);
-		struct page *ptpage;
-		if (!pfn_valid(pfn))
-			return;
-		ptpage = pfn_to_page(pfn);
-		if (PageReserved(ptpage))
-			return;
-		page_cache_release(ptpage);
-		return;
-	}
-	swap_free(pte_to_swp_entry(page));
-#else
-	if (!pte_none(page)) {
-		printk("forget_pte: old mapping existed!\n");
-		BUG();
-	}
-#endif
-}
-
 /* Remap IO memory, the same way as remap_pfn_range(), but use
  * the obio memory space.
  *
@@ -60,7 +35,6 @@
 		pte_t oldpage = *pte;
 		pte_clear(mm, address, pte);
 		set_pte(pte, mk_pte_io(offset, prot, space));
-		forget_pte(oldpage);
 		address += PAGE_SIZE;
 		offset += PAGE_SIZE;
 		pte++;
@@ -86,37 +60,6 @@
 		pmd++;
 	} while (address < end);
 	return 0;
-}
-
-int io_remap_page_range(struct vm_area_struct *vma, unsigned long from, unsigned long offset, unsigned long size, pgprot_t prot, int space)
-{
-	int error = 0;
-	pgd_t * dir;
-	unsigned long beg = from;
-	unsigned long end = from + size;
-	struct mm_struct *mm = vma->vm_mm;
-
-	prot = __pgprot(pg_iobits);
-	offset -= from;
-	dir = pgd_offset(mm, from);
-	flush_cache_range(vma, beg, end);
-
-	spin_lock(&mm->page_table_lock);
-	while (from < end) {
-		pmd_t *pmd = pmd_alloc(current->mm, dir, from);
-		error = -ENOMEM;
-		if (!pmd)
-			break;
-		error = io_remap_pmd_range(mm, pmd, from, end - from, offset + from, prot, space);
-		if (error)
-			break;
-		from = (from + PGDIR_SIZE) & PGDIR_MASK;
-		dir++;
-	}
-	spin_unlock(&mm->page_table_lock);
-
-	flush_tlb_range(vma, beg, end);
-	return error;
 }
  
 int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
@@ -736,8 +736,7 @@
 static void __pci_mmap_set_pgprot(struct pci_dev *dev, struct vm_area_struct *vma,
 					     enum pci_mmap_state mmap_state)
 {
-	/* Our io_remap_page_range/io_remap_pfn_range takes care of this,
-	   do nothing. */
+	/* Our io_remap_pfn_range takes care of this, do nothing.  */
 }
  
 /* Perform the actual remap of the pages for a PCI device mapping, as appropriate
@@ -88,8 +88,6 @@
 extern int compat_sys_ioctl(unsigned int fd, unsigned int cmd, u32 arg);
 extern int (*handle_mathemu)(struct pt_regs *, struct fpustate *);
 extern long sparc32_open(const char __user * filename, int flags, int mode);
-extern int io_remap_page_range(struct vm_area_struct *vma, unsigned long from,
-	unsigned long offset, unsigned long size, pgprot_t prot, int space);
 extern int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
 	unsigned long pfn, unsigned long size, pgprot_t prot);
 extern void (*prom_palette)(int);
@@ -245,7 +243,6 @@
 #endif
  
 /* I/O device mmaping on Sparc64. */
-EXPORT_SYMBOL(io_remap_page_range);
 EXPORT_SYMBOL(io_remap_pfn_range);
  
 /* Solaris/SunOS binary compatibility */
@@ -116,37 +116,6 @@
 	return 0;
 }
  
-int io_remap_page_range(struct vm_area_struct *vma, unsigned long from, unsigned long offset, unsigned long size, pgprot_t prot, int space)
-{
-	int error = 0;
-	pgd_t * dir;
-	unsigned long beg = from;
-	unsigned long end = from + size;
-	struct mm_struct *mm = vma->vm_mm;
-
-	prot = __pgprot(pg_iobits);
-	offset -= from;
-	dir = pgd_offset(mm, from);
-	flush_cache_range(vma, beg, end);
-
-	spin_lock(&mm->page_table_lock);
-	while (from < end) {
-		pud_t *pud = pud_alloc(mm, dir, from);
-		error = -ENOMEM;
-		if (!pud)
-			break;
-		error = io_remap_pud_range(mm, pud, from, end - from, offset + from, prot, space);
-		if (error)
-			break;
-		from = (from + PGDIR_SIZE) & PGDIR_MASK;
-		dir++;
-	}
-	flush_tlb_range(vma, beg, end);
-	spin_unlock(&mm->page_table_lock);
-
-	return error;
-}
-
 int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
 		unsigned long pfn, unsigned long size, pgprot_t prot)
 {
@@ -435,9 +435,6 @@
 #define kern_addr_valid(addr) \
 	(test_bit(__pa((unsigned long)(addr))>>20, sparc_valid_addr_bitmap))
  
-extern int io_remap_page_range(struct vm_area_struct *vma,
-			       unsigned long from, unsigned long to,
-			       unsigned long size, pgprot_t prot, int space);
 extern int io_remap_pfn_range(struct vm_area_struct *vma,
 			      unsigned long from, unsigned long pfn,
 			      unsigned long size, pgprot_t prot);
@@ -410,9 +410,6 @@
 #define kern_addr_valid(addr)	\
 	(test_bit(__pa((unsigned long)(addr))>>22, sparc64_valid_addr_bitmap))
  
-extern int io_remap_page_range(struct vm_area_struct *vma, unsigned long from,
-			       unsigned long offset,
-			       unsigned long size, pgprot_t prot, int space);
 extern int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
 			       unsigned long pfn,
 			       unsigned long size, pgprot_t prot);
...	...	@@ -175,7 +175,6 @@
175	175	EXPORT_SYMBOL(get_auxio);
176	176	#endif
177	177	EXPORT_SYMBOL(request_fast_irq);
178		-EXPORT_SYMBOL(io_remap_page_range);
179	178	EXPORT_SYMBOL(io_remap_pfn_range);
180	179	/* P3: iounit_xxx may be needed, sun4d users */
181	180	/* EXPORT_SYMBOL(iounit_map_dma_init); */
...	...	@@ -16,31 +16,6 @@
16	16	#include <asm/cacheflush.h>
17	17	#include <asm/tlbflush.h>
18	18
19		-static inline void forget_pte(pte_t page)
20		-{
21		-#if 0 /* old 2.4 code */
22		- if (pte_none(page))
23		- return;
24		- if (pte_present(page)) {
25		- unsigned long pfn = pte_pfn(page);
26		- struct page *ptpage;
27		- if (!pfn_valid(pfn))
28		- return;
29		- ptpage = pfn_to_page(pfn);
30		- if (PageReserved(ptpage))
31		- return;
32		- page_cache_release(ptpage);
33		- return;
34		- }
35		- swap_free(pte_to_swp_entry(page));
36		-#else
37		- if (!pte_none(page)) {
38		- printk("forget_pte: old mapping existed!\n");
39		- BUG();
40		- }
41		-#endif
42		-}
43		-
44	19	/* Remap IO memory, the same way as remap_pfn_range(), but use
45	20	* the obio memory space.
46	21	*
...	...	@@ -60,7 +35,6 @@
60	35	pte_t oldpage = *pte;
61	36	pte_clear(mm, address, pte);
62	37	set_pte(pte, mk_pte_io(offset, prot, space));
63		- forget_pte(oldpage);
64	38	address += PAGE_SIZE;
65	39	offset += PAGE_SIZE;
66	40	pte++;
...	...	@@ -86,37 +60,6 @@
86	60	pmd++;
87	61	} while (address < end);
88	62	return 0;
89		-}
90		-
91		-int io_remap_page_range(struct vm_area_struct *vma, unsigned long from, unsigned long offset, unsigned long size, pgprot_t prot, int space)
92		-{
93		- int error = 0;
94		- pgd_t * dir;
95		- unsigned long beg = from;
96		- unsigned long end = from + size;
97		- struct mm_struct *mm = vma->vm_mm;
98		-
99		- prot = __pgprot(pg_iobits);
100		- offset -= from;
101		- dir = pgd_offset(mm, from);
102		- flush_cache_range(vma, beg, end);
103		-
104		- spin_lock(&mm->page_table_lock);
105		- while (from < end) {
106		- pmd_t *pmd = pmd_alloc(current->mm, dir, from);
107		- error = -ENOMEM;
108		- if (!pmd)
109		- break;
110		- error = io_remap_pmd_range(mm, pmd, from, end - from, offset + from, prot, space);
111		- if (error)
112		- break;
113		- from = (from + PGDIR_SIZE) & PGDIR_MASK;
114		- dir++;
115		- }
116		- spin_unlock(&mm->page_table_lock);
117		-
118		- flush_tlb_range(vma, beg, end);
119		- return error;
120	63	}
121	64
122	65	int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
...	...	@@ -736,8 +736,7 @@
736	736	static void __pci_mmap_set_pgprot(struct pci_dev dev, struct vm_area_struct vma,
737	737	enum pci_mmap_state mmap_state)
738	738	{
739		- /* Our io_remap_page_range/io_remap_pfn_range takes care of this,
740		- do nothing. */
	739	+ /* Our io_remap_pfn_range takes care of this, do nothing. */
741	740	}
742	741
743	742	/* Perform the actual remap of the pages for a PCI device mapping, as appropriate
...	...	@@ -88,8 +88,6 @@
88	88	extern int compat_sys_ioctl(unsigned int fd, unsigned int cmd, u32 arg);
89	89	extern int (handle_mathemu)(struct pt_regs , struct fpustate *);
90	90	extern long sparc32_open(const char __user * filename, int flags, int mode);
91		-extern int io_remap_page_range(struct vm_area_struct *vma, unsigned long from,
92		- unsigned long offset, unsigned long size, pgprot_t prot, int space);
93	91	extern int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
94	92	unsigned long pfn, unsigned long size, pgprot_t prot);
95	93	extern void (*prom_palette)(int);
...	...	@@ -245,7 +243,6 @@
245	243	#endif
246	244
247	245	/* I/O device mmaping on Sparc64. */
248		-EXPORT_SYMBOL(io_remap_page_range);
249	246	EXPORT_SYMBOL(io_remap_pfn_range);
250	247
251	248	/* Solaris/SunOS binary compatibility */
...	...	@@ -116,37 +116,6 @@
116	116	return 0;
117	117	}
118	118
119		-int io_remap_page_range(struct vm_area_struct *vma, unsigned long from, unsigned long offset, unsigned long size, pgprot_t prot, int space)
120		-{
121		- int error = 0;
122		- pgd_t * dir;
123		- unsigned long beg = from;
124		- unsigned long end = from + size;
125		- struct mm_struct *mm = vma->vm_mm;
126		-
127		- prot = __pgprot(pg_iobits);
128		- offset -= from;
129		- dir = pgd_offset(mm, from);
130		- flush_cache_range(vma, beg, end);
131		-
132		- spin_lock(&mm->page_table_lock);
133		- while (from < end) {
134		- pud_t *pud = pud_alloc(mm, dir, from);
135		- error = -ENOMEM;
136		- if (!pud)
137		- break;
138		- error = io_remap_pud_range(mm, pud, from, end - from, offset + from, prot, space);
139		- if (error)
140		- break;
141		- from = (from + PGDIR_SIZE) & PGDIR_MASK;
142		- dir++;
143		- }
144		- flush_tlb_range(vma, beg, end);
145		- spin_unlock(&mm->page_table_lock);
146		-
147		- return error;
148		-}
149		-
150	119	int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
151	120	unsigned long pfn, unsigned long size, pgprot_t prot)
152	121	{
...	...	@@ -435,9 +435,6 @@
435	435	#define kern_addr_valid(addr) \
436	436	(test_bit(__pa((unsigned long)(addr))>>20, sparc_valid_addr_bitmap))
437	437
438		-extern int io_remap_page_range(struct vm_area_struct *vma,
439		- unsigned long from, unsigned long to,
440		- unsigned long size, pgprot_t prot, int space);
441	438	extern int io_remap_pfn_range(struct vm_area_struct *vma,
442	439	unsigned long from, unsigned long pfn,
443	440	unsigned long size, pgprot_t prot);
...	...	@@ -410,9 +410,6 @@
410	410	#define kern_addr_valid(addr) \
411	411	(test_bit(__pa((unsigned long)(addr))>>22, sparc64_valid_addr_bitmap))
412	412
413		-extern int io_remap_page_range(struct vm_area_struct *vma, unsigned long from,
414		- unsigned long offset,
415		- unsigned long size, pgprot_t prot, int space);
416	413	extern int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
417	414	unsigned long pfn,
418	415	unsigned long size, pgprot_t prot);