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

Commit 84eda280 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull final kmap_atomic cleanups from Cong Wang:
 "This should be the final round of cleanup, as the definitions of enum
  km_type finally get removed from the whole tree.  The patches have
  been in linux-next for a long time."

* 'kmap_atomic' of git://github.com/congwang/linux:
  pipe: remove KM_USER0 from comments
  vmalloc: remove KM_USER0 from comments
  feature-removal-schedule.txt: remove kmap_atomic(page, km_type)
  tile: remove km_type definitions
  um: remove km_type definitions
  asm-generic: remove km_type definitions
  avr32: remove km_type definitions
  frv: remove km_type definitions
  powerpc: remove km_type definitions
  arm: remove km_type definitions
  highmem: remove the deprecated form of kmap_atomic
  tile: remove usage of enum km_type
  frv: remove the second parameter of kmap_atomic_primary()
  jbd2: remove the second argument of kmap_atomic
parents b387e41e 2164d334

Documentation/feature-removal-schedule.txt

+0 −8
Original line number Diff line number Diff line
@@ -512,14 +512,6 @@ 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>



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



What:	get_robust_list syscall

When:	2013

Why:	There appear to be no production users of the get_robust_list syscall,

arch/arm/include/asm/kmap_types.h

+1 −25
Original line number Diff line number Diff line
@@ -4,30 +4,6 @@ 
/*

 * This is the "bare minimum".  AIO seems to require this.

 */

enum km_type {

	KM_BOUNCE_READ,

	KM_SKB_SUNRPC_DATA,

	KM_SKB_DATA_SOFTIRQ,

	KM_USER0,

	KM_USER1,

	KM_BIO_SRC_IRQ,

	KM_BIO_DST_IRQ,

	KM_PTE0,

	KM_PTE1,

	KM_IRQ0,

	KM_IRQ1,

	KM_SOFTIRQ0,

	KM_SOFTIRQ1,

	KM_L1_CACHE,

	KM_L2_CACHE,

	KM_KDB,

	KM_TYPE_NR

};



#ifdef CONFIG_DEBUG_HIGHMEM

#define KM_NMI		(-1)

#define KM_NMI_PTE	(-1)

#define KM_IRQ_PTE	(-1)

#endif

#define KM_TYPE_NR 16



#endif

arch/avr32/include/asm/kmap_types.h

+2 −22
Original line number Diff line number Diff line
@@ -2,29 +2,9 @@ 
#define __ASM_AVR32_KMAP_TYPES_H



#ifdef CONFIG_DEBUG_HIGHMEM

# define D(n) __KM_FENCE_##n ,

# define KM_TYPE_NR 29

#else

# define D(n)

# define KM_TYPE_NR 14

#endif



enum km_type {

D(0)	KM_BOUNCE_READ,

D(1)	KM_SKB_SUNRPC_DATA,

D(2)	KM_SKB_DATA_SOFTIRQ,

D(3)	KM_USER0,

D(4)	KM_USER1,

D(5)	KM_BIO_SRC_IRQ,

D(6)	KM_BIO_DST_IRQ,

D(7)	KM_PTE0,

D(8)	KM_PTE1,

D(9)	KM_PTE2,

D(10)	KM_IRQ0,

D(11)	KM_IRQ1,

D(12)	KM_SOFTIRQ0,

D(13)	KM_SOFTIRQ1,

D(14)	KM_TYPE_NR

};



#undef D



#endif /* __ASM_AVR32_KMAP_TYPES_H */

arch/frv/include/asm/highmem.h

+9 −25
Original line number Diff line number Diff line
@@ -76,15 +76,16 @@ extern struct page *kmap_atomic_to_page(void *ptr); 


#ifndef __ASSEMBLY__



#define __kmap_atomic_primary(type, paddr, ampr)						\

#define __kmap_atomic_primary(cached, paddr, ampr)						\

({												\

	unsigned long damlr, dampr;								\

												\

	dampr = paddr | xAMPRx_L | xAMPRx_M | xAMPRx_S | xAMPRx_SS_16Kb | xAMPRx_V;		\

												\

	if (type != __KM_CACHE)									\

	if (!cached)										\

		asm volatile("movgs %0,dampr"#ampr :: "r"(dampr) : "memory");			\

	else											\

		/* cache flush page attachment point */						\

		asm volatile("movgs %0,iampr"#ampr"\n"						\

			     "movgs %0,dampr"#ampr"\n"						\

			     :: "r"(dampr) : "memory"						\
@@ -112,29 +113,20 @@ extern struct page *kmap_atomic_to_page(void *ptr); 
	(void *) damlr;										  \

})



static inline void *kmap_atomic_primary(struct page *page, enum km_type type)

static inline void *kmap_atomic_primary(struct page *page)

{

	unsigned long paddr;



	pagefault_disable();

	paddr = page_to_phys(page);



	switch (type) {

        case 0:		return __kmap_atomic_primary(0, paddr, 2);

        case 1:		return __kmap_atomic_primary(1, paddr, 3);

        case 2:		return __kmap_atomic_primary(2, paddr, 4);

        case 3:		return __kmap_atomic_primary(3, paddr, 5);



	default:

		BUG();

		return NULL;

	}

        return __kmap_atomic_primary(1, paddr, 2);

}



#define __kunmap_atomic_primary(type, ampr)				\

#define __kunmap_atomic_primary(cached, ampr)				\

do {									\

	asm volatile("movgs gr0,dampr"#ampr"\n" ::: "memory");		\

	if (type == __KM_CACHE)						\

	if (cached)							\

		asm volatile("movgs gr0,iampr"#ampr"\n" ::: "memory");	\

} while(0)
@@ -143,17 +135,9 @@ do { \ 
	asm volatile("tlbpr %0,gr0,#4,#1" : : "r"(vaddr) : "memory");	\

} while(0)



static inline void kunmap_atomic_primary(void *kvaddr, enum km_type type)

static inline void kunmap_atomic_primary(void *kvaddr)

{

	switch (type) {

        case 0:		__kunmap_atomic_primary(0, 2);	break;

        case 1:		__kunmap_atomic_primary(1, 3);	break;

        case 2:		__kunmap_atomic_primary(2, 4);	break;

        case 3:		__kunmap_atomic_primary(3, 5);	break;



	default:

		BUG();

	}

        __kunmap_atomic_primary(1, 2);

	pagefault_enable();

}

arch/frv/include/asm/kmap_types.h

+1 −23
Original line number Diff line number Diff line
@@ -2,28 +2,6 @@ 
#ifndef _ASM_KMAP_TYPES_H

#define _ASM_KMAP_TYPES_H



enum km_type {

	/* arch specific kmaps - change the numbers attached to these at your peril */

	__KM_CACHE,		/* cache flush page attachment point */

	__KM_PGD,		/* current page directory */

	__KM_ITLB_PTD,		/* current instruction TLB miss page table lookup */

	__KM_DTLB_PTD,		/* current data TLB miss page table lookup */



	/* general kmaps */

        KM_BOUNCE_READ,

        KM_SKB_SUNRPC_DATA,

        KM_SKB_DATA_SOFTIRQ,

        KM_USER0,

        KM_USER1,

	KM_BIO_SRC_IRQ,

	KM_BIO_DST_IRQ,

	KM_PTE0,

	KM_PTE1,

	KM_IRQ0,

	KM_IRQ1,

	KM_SOFTIRQ0,

	KM_SOFTIRQ1,

	KM_TYPE_NR

};

#define KM_TYPE_NR 17



#endif