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

Commit e4c9dd0f authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

kmap_types: make most arches use generic header file 



Convert most arches to use asm-generic/kmap_types.h.

Move the KM_FENCE_ macro additions into asm-generic/kmap_types.h,
controlled by __WITH_KM_FENCE from each arch's kmap_types.h file.

Would be nice to be able to add custom KM_types per arch, but I don't yet
see a nice, clean way to do that.

Built on x86_64, i386, mips, sparc, alpha(tonyb), powerpc(tonyb), and
68k(tonyb).

Note: avr32 should be able to remove KM_PTE2 (since it's not used) and
then just use the generic kmap_types.h file.  Get avr32 maintainer
approval.

Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Cc: <linux-arch@vger.kernel.org>
Acked-by: default avatarMike Frysinger <vapier@gentoo.org>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Bryan Wu <cooloney@kernel.org>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: "Luck Tony" <tony.luck@intel.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b8d9a865

arch/alpha/include/asm/kmap_types.h

+3 −21
Original line number Diff line number Diff line
@@ -3,30 +3,12 @@ 


/* Dummy header just to define km_type. */





#ifdef CONFIG_DEBUG_HIGHMEM

# define D(n) __KM_FENCE_##n ,

#else

# define D(n)

#define  __WITH_KM_FENCE

#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_IRQ0,

D(10)	KM_IRQ1,

D(11)	KM_SOFTIRQ0,

D(12)	KM_SOFTIRQ1,

D(13)	KM_TYPE_NR

};

#include <asm-generic/kmap_types.h>



#undef D

#undef __WITH_KM_FENCE



#endif

arch/blackfin/include/asm/kmap_types.h

+1 −16
Original line number Diff line number Diff line 
#ifndef _ASM_KMAP_TYPES_H

#define _ASM_KMAP_TYPES_H



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_TYPE_NR

};

#include <asm-generic/kmap_types.h>



#endif

arch/cris/include/asm/kmap_types.h

+1 −16
Original line number Diff line number Diff line
@@ -5,21 +5,6 @@ 
 * is actually used on cris. 

 */



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_TYPE_NR

};

#include <asm-generic/kmap_types.h>



#endif

arch/h8300/include/asm/kmap_types.h

+1 −16
Original line number Diff line number Diff line 
#ifndef _ASM_H8300_KMAP_TYPES_H

#define _ASM_H8300_KMAP_TYPES_H



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_TYPE_NR

};

#include <asm-generic/kmap_types.h>



#endif

arch/ia64/include/asm/kmap_types.h

+3 −21
Original line number Diff line number Diff line 
#ifndef _ASM_IA64_KMAP_TYPES_H

#define _ASM_IA64_KMAP_TYPES_H





#ifdef CONFIG_DEBUG_HIGHMEM

# define D(n) __KM_FENCE_##n ,

#else

# define D(n)

#define  __WITH_KM_FENCE

#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_IRQ0,

D(10)	KM_IRQ1,

D(11)	KM_SOFTIRQ0,

D(12)	KM_SOFTIRQ1,

D(13)	KM_TYPE_NR

};

#include <asm-generic/kmap_types.h>



#undef D

#undef __WITH_KM_FENCE



#endif /* _ASM_IA64_KMAP_TYPES_H */