Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f393834 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kmap_atomic' of git://github.com/congwang/linux 

Pull kmap_atomic cleanup from Cong Wang.

It's been in -next for a long time, and it gets rid of the (no longer
used) second argument to k[un]map_atomic().

Fix up a few trivial conflicts in various drivers, and do an "evil
merge" to catch some new uses that have come in since Cong's tree.

* 'kmap_atomic' of git://github.com/congwang/linux: (59 commits)
  feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal
  highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]
  drbd: remove the second argument of k[un]map_atomic()
  zcache: remove the second argument of k[un]map_atomic()
  gma500: remove the second argument of k[un]map_atomic()
  dm: remove the second argument of k[un]map_atomic()
  tomoyo: remove the second argument of k[un]map_atomic()
  sunrpc: remove the second argument of k[un]map_atomic()
  rds: remove the second argument of k[un]map_atomic()
  net: remove the second argument of k[un]map_atomic()
  mm: remove the second argument of k[un]map_atomic()
  lib: remove the second argument of k[un]map_atomic()
  power: remove the second argument of k[un]map_atomic()
  kdb: remove the second argument of k[un]map_atomic()
  udf: remove the second argument of k[un]map_atomic()
  ubifs: remove the second argument of k[un]map_atomic()
  squashfs: remove the second argument of k[un]map_atomic()
  reiserfs: remove the second argument of k[un]map_atomic()
  ocfs2: remove the second argument of k[un]map_atomic()
  ntfs: remove the second argument of k[un]map_atomic()
  ...
parents 69a7aebc 317b6e12

Documentation/feature-removal-schedule.txt

+8 −0
Original line number Diff line number Diff line
@@ -535,3 +535,11 @@ Why: This driver provides support for USB storage devices like "USB 
        (CONFIG_USB_STORAGE) which only drawback is the additional SCSI

        stack.

Who:	Sebastian Andrzej Siewior <sebastian@breakpoint.cc>



----------------------------



What:	kmap_atomic(page, km_type)

When:	3.5

Why:	The old kmap_atomic() with two arguments is deprecated, we only

	keep it for backward compatibility for few cycles and then drop it.

Who:	Cong Wang <amwang@redhat.com>

arch/arm/include/asm/highmem.h

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

extern void *kmap(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 *kmap_atomic_pfn(unsigned long pfn);

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

arch/arm/mm/copypage-fa.c

+6 −6
Original line number Diff line number Diff line
@@ -44,11 +44,11 @@ void fa_copy_user_highpage(struct page *to, struct page *from, 
{

	void *kto, *kfrom;



	kto = kmap_atomic(to, KM_USER0);

	kfrom = kmap_atomic(from, KM_USER1);

	kto = kmap_atomic(to);

	kfrom = kmap_atomic(from);

	fa_copy_user_page(kto, kfrom);

	kunmap_atomic(kfrom, KM_USER1);

	kunmap_atomic(kto, KM_USER0);

	kunmap_atomic(kfrom);

	kunmap_atomic(kto);

}



/*
@@ -58,7 +58,7 @@ void fa_copy_user_highpage(struct page *to, struct page *from, 
 */

void fa_clear_user_highpage(struct page *page, unsigned long vaddr)

{

	void *ptr, *kaddr = kmap_atomic(page, KM_USER0);

	void *ptr, *kaddr = kmap_atomic(page);

	asm volatile("\

	mov	r1, %2				@ 1\n\

	mov	r2, #0				@ 1\n\
@@ -77,7 +77,7 @@ void fa_clear_user_highpage(struct page *page, unsigned long vaddr) 
	: "=r" (ptr)

	: "0" (kaddr), "I" (PAGE_SIZE / 32)

	: "r1", "r2", "r3", "ip", "lr");

	kunmap_atomic(kaddr, KM_USER0);

	kunmap_atomic(kaddr);

}



struct cpu_user_fns fa_user_fns __initdata = {

arch/arm/mm/copypage-feroceon.c

+6 −6
Original line number Diff line number Diff line
@@ -72,17 +72,17 @@ void feroceon_copy_user_highpage(struct page *to, struct page *from, 
{

	void *kto, *kfrom;



	kto = kmap_atomic(to, KM_USER0);

	kfrom = kmap_atomic(from, KM_USER1);

	kto = kmap_atomic(to);

	kfrom = kmap_atomic(from);

	flush_cache_page(vma, vaddr, page_to_pfn(from));

	feroceon_copy_user_page(kto, kfrom);

	kunmap_atomic(kfrom, KM_USER1);

	kunmap_atomic(kto, KM_USER0);

	kunmap_atomic(kfrom);

	kunmap_atomic(kto);

}



void feroceon_clear_user_highpage(struct page *page, unsigned long vaddr)

{

	void *ptr, *kaddr = kmap_atomic(page, KM_USER0);

	void *ptr, *kaddr = kmap_atomic(page);

	asm volatile ("\

	mov	r1, %2				\n\

	mov	r2, #0				\n\
@@ -102,7 +102,7 @@ void feroceon_clear_user_highpage(struct page *page, unsigned long vaddr) 
	: "=r" (ptr)

	: "0" (kaddr), "I" (PAGE_SIZE / 32)

	: "r1", "r2", "r3", "r4", "r5", "r6", "r7", "ip", "lr");

	kunmap_atomic(kaddr, KM_USER0);

	kunmap_atomic(kaddr);

}



struct cpu_user_fns feroceon_user_fns __initdata = {

arch/arm/mm/copypage-v3.c

+6 −6
Original line number Diff line number Diff line
@@ -42,11 +42,11 @@ void v3_copy_user_highpage(struct page *to, struct page *from, 
{

	void *kto, *kfrom;



	kto = kmap_atomic(to, KM_USER0);

	kfrom = kmap_atomic(from, KM_USER1);

	kto = kmap_atomic(to);

	kfrom = kmap_atomic(from);

	v3_copy_user_page(kto, kfrom);

	kunmap_atomic(kfrom, KM_USER1);

	kunmap_atomic(kto, KM_USER0);

	kunmap_atomic(kfrom);

	kunmap_atomic(kto);

}



/*
@@ -56,7 +56,7 @@ void v3_copy_user_highpage(struct page *to, struct page *from, 
 */

void v3_clear_user_highpage(struct page *page, unsigned long vaddr)

{

	void *ptr, *kaddr = kmap_atomic(page, KM_USER0);

	void *ptr, *kaddr = kmap_atomic(page);

	asm volatile("\n\

	mov	r1, %2				@ 1\n\

	mov	r2, #0				@ 1\n\
@@ -72,7 +72,7 @@ void v3_clear_user_highpage(struct page *page, unsigned long vaddr) 
	: "=r" (ptr)

	: "0" (kaddr), "I" (PAGE_SIZE / 64)

	: "r1", "r2", "r3", "ip", "lr");

	kunmap_atomic(kaddr, KM_USER0);

	kunmap_atomic(kaddr);

}



struct cpu_user_fns v3_user_fns __initdata = {