Commit a24401bc authored by Cong Wang's avatar Cong Wang Committed by Cong Wang
Browse files

highmem: kill all __kmap_atomic() 


[swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarCong Wang <amwang@redhat.com>
parent 589973a7

arch/arm/include/asm/highmem.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ static inline void *kmap_high_get(struct page *page) 
#ifdef CONFIG_HIGHMEM

#ifdef CONFIG_HIGHMEM

extern void *kmap(struct page *page);

extern void *kmap(struct page *page);

extern void kunmap(struct page *page);

extern void kunmap(struct page *page);

extern void *__kmap_atomic(struct page *page);

extern void *kmap_atomic(struct page *page);

extern void __kunmap_atomic(void *kvaddr);

extern void __kunmap_atomic(void *kvaddr);

extern void *kmap_atomic_pfn(unsigned long pfn);

extern void *kmap_atomic_pfn(unsigned long pfn);

extern struct page *kmap_atomic_to_page(const void *ptr);

extern struct page *kmap_atomic_to_page(const void *ptr);

arch/arm/mm/highmem.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ void kunmap(struct page *page) 
}

}

EXPORT_SYMBOL(kunmap);

EXPORT_SYMBOL(kunmap);





void *__kmap_atomic(struct page *page)

void *kmap_atomic(struct page *page)

{

{

	unsigned int idx;

	unsigned int idx;

	unsigned long vaddr;

	unsigned long vaddr;
@@ -81,7 +81,7 @@ void *__kmap_atomic(struct page *page) 




	return (void *)vaddr;

	return (void *)vaddr;

}

}

EXPORT_SYMBOL(__kmap_atomic);

EXPORT_SYMBOL(kmap_atomic);





void __kunmap_atomic(void *kvaddr)

void __kunmap_atomic(void *kvaddr)

{

{

arch/frv/include/asm/highmem.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -157,7 +157,7 @@ static inline void kunmap_atomic_primary(void *kvaddr, enum km_type type) 
	pagefault_enable();

	pagefault_enable();

}

}





void *__kmap_atomic(struct page *page);

void *kmap_atomic(struct page *page);

void __kunmap_atomic(void *kvaddr);

void __kunmap_atomic(void *kvaddr);





#endif /* !__ASSEMBLY__ */

#endif /* !__ASSEMBLY__ */

arch/frv/mm/highmem.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ struct page *kmap_atomic_to_page(void *ptr) 
	return virt_to_page(ptr);

	return virt_to_page(ptr);

}

}





void *__kmap_atomic(struct page *page)

void *kmap_atomic(struct page *page)

{

{

	unsigned long paddr;

	unsigned long paddr;

	int type;

	int type;
@@ -64,7 +64,7 @@ void *__kmap_atomic(struct page *page) 
		return NULL;

		return NULL;

	}

	}

}

}

EXPORT_SYMBOL(__kmap_atomic);

EXPORT_SYMBOL(kmap_atomic);





void __kunmap_atomic(void *kvaddr)

void __kunmap_atomic(void *kvaddr)

{

{

arch/mips/include/asm/highmem.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ extern void kunmap_high(struct page *page); 




extern void *kmap(struct page *page);

extern void *kmap(struct page *page);

extern void kunmap(struct page *page);

extern void kunmap(struct page *page);

extern void *__kmap_atomic(struct page *page);

extern void *kmap_atomic(struct page *page);

extern void __kunmap_atomic(void *kvaddr);

extern void __kunmap_atomic(void *kvaddr);

extern void *kmap_atomic_pfn(unsigned long pfn);

extern void *kmap_atomic_pfn(unsigned long pfn);

extern struct page *kmap_atomic_to_page(void *ptr);

extern struct page *kmap_atomic_to_page(void *ptr);