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

Commit c4ac82a8 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner
Browse files

x86: unify include/asm/agp_32/64.h 



The 32bit D(n) debug addon can be made exclusive for 32 bit compiles.
Otherwise all the same.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 35cc4611

include/asm-x86/kmap_types.h

+27 −3
Original line number Diff line number Diff line 
#ifdef CONFIG_X86_32

# include "kmap_types_32.h"

#ifndef _ASM_X86_KMAP_TYPES_H

#define _ASM_X86_KMAP_TYPES_H



#if defined(CONFIG_X86_32) && defined(CONFIG_DEBUG_HIGHMEM)

# define D(n) __KM_FENCE_##n ,

#else

# include "kmap_types_64.h"

# define D(n)

#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

};



#undef D



#endif

include/asm-x86/kmap_types_32.h

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
#ifndef _ASM_KMAP_TYPES_H

#define _ASM_KMAP_TYPES_H





#ifdef CONFIG_DEBUG_HIGHMEM

# define D(n) __KM_FENCE_##n ,

#else

# define D(n)

#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

};



#undef D



#endif

include/asm-x86/kmap_types_64.h

deleted100644 → 0
+0 −19
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_IRQ0,

	KM_IRQ1,

	KM_SOFTIRQ0,

	KM_SOFTIRQ1,

	KM_TYPE_NR

};



#endif