David Howells 7e3cdf242f UAPI: Make arch/ia64/include/asm/kvm_para.h generic ... Make arch/ia64/include/asm/kvm_para.h generic since it's the same as the asm-generic version. This deals with the problem when ia64 is compiled with allmodconfig you get: In file included from include/uapi/linux/kvm_para.h:26:0, from include/linux/kvm_para.h:4, from kernel/watchdog.c:28: arch/ia64/include/asm/kvm_para.h:24:28: error: redefinition of 'kvm_arch_para_features' include/asm-generic/kvm_para.h:16:28: note: previous definition of 'kvm_arch_para_features' was here arch/ia64/include/asm/kvm_para.h:29:20: error: redefinition of 'kvm_check_and_clear_guest_paused' include/asm-generic/kvm_para.h:11:20: note: previous definition of 'kvm_check_and_clear_guest_paused' was here This does not happen for ia64 defconfig. Reported-by: Yuanhan Liu <yuanhan.liu@intel.com> Signed-off-by: David Howells <dhowells@redhat.com> cc: Yuanhan Liu <yuanhan.liu@intel.com> cc: fengguang.wu@intel.com Signed-off-by: Tony Luck <tony.luck@intel.com>		2012-10-18 17:27:43 -07:00
..
native	…
sn	Disintegrate asm/system.h for IA64	2012-03-28 18:30:02 +01:00
uv	Disintegrate asm/system.h for IA64	2012-03-28 18:30:02 +01:00
xen	xen/arm: Introduce xen_ulong_t for unsigned long	2012-09-14 13:34:43 +00:00
Kbuild	UAPI: Make arch/ia64/include/asm/kvm_para.h generic	2012-10-18 17:27:43 -07:00
acpi-ext.h	…
acpi.h	Disintegrate asm/system.h for IA64	2012-03-28 18:30:02 +01:00
agp.h	…
asm-offsets.h	…
asmmacro.h	…
atomic.h	[IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts	2012-07-26 10:55:26 -07:00
barrier.h	Disintegrate asm/system.h for IA64	2012-03-28 18:30:02 +01:00
bitops.h	asm-generic: add another generic ext2 atomic bitops	2011-07-26 16:49:46 -07:00
bug.h	…
bugs.h	…
cache.h	…
cacheflush.h	…
checksum.h	…
clocksource.h	clocksource: Change __ARCH_HAS_CLOCKSOURCE_DATA to a CONFIG option	2011-07-21 13:34:05 -07:00
cpu.h	…
cputime.h	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-01-06 08:44:54 -08:00
current.h	…
cyclone.h	…
delay.h	…
device.h	iommu: Rename the DMAR and INTR_REMAP config options	2011-09-21 10:22:03 +02:00
div64.h	…
dma-mapping.h	X86 & IA64: adapt for dma_map_ops changes	2012-03-28 16:36:31 +02:00
dma.h	…
dmi.h	…
elf.h	…
emergency-restart.h	…
esi.h	…
fb.h	…
fpswa.h	…
ftrace.h	…
futex.h	ia64: fix futex_atomic_cmpxchg_inatomic()	2012-04-16 18:30:01 -07:00
gcc_intrin.h	UAPI: (Scripted) Disintegrate arch/ia64/include/asm	2012-10-09 09:47:00 +01:00
gpio.h	gpiolib/arches: Centralise bolierplate asm/gpio.h	2012-05-11 18:00:14 -06:00
hardirq.h	[IA64] Move local_softirq_pending() definition	2010-10-19 13:31:11 +02:00
hpsim.h	hpsim, initialize chip for assigned irqs	2012-03-08 12:26:30 -08:00
hugetlb.h	mm: hugetlb: add arch hook for clearing page flags before entering pool	2012-10-09 16:22:24 +09:00
hw_irq.h	ia64: Remove redundant declaration of irq_desc[]	2011-03-29 14:48:05 +02:00
idle.h	…
intrinsics.h	UAPI: (Scripted) Disintegrate arch/ia64/include/asm	2012-10-09 09:47:00 +01:00
io.h	Disintegrate asm/system.h for IA64	2012-03-28 18:30:02 +01:00
iommu.h	iommu: Remove group_mf	2012-06-25 13:48:30 +02:00
iommu_table.h	ia64, iommu: Add a dummy iommu_table.h file in IA64.	2010-10-08 13:11:11 -07:00
iosapic.h	…
irq.h	…
irq_regs.h	…
irq_remapping.h	iommu: rename intr_remapping.[ch] to irq_remapping.[ch]	2012-05-07 14:35:00 +02:00
irqflags.h	Disintegrate asm/system.h for IA64	2012-03-28 18:30:02 +01:00
kdebug.h	…
kexec.h	Disintegrate asm/system.h for IA64	2012-03-28 18:30:02 +01:00
kmap_types.h	…
kprobes.h	…
kregs.h	…
kvm_host.h	KVM: Fix page-crossing MMIO	2012-04-19 20:35:07 -03:00
libata-portmap.h	…
linkage.h	…
local.h	…
local64.h	…
machvec.h	[IA64] Rename platform_name to ia64_platform_name	2012-07-25 11:47:16 -07:00
machvec_dig.h	[IA64] Rename platform_name to ia64_platform_name	2012-07-25 11:47:16 -07:00
machvec_dig_vtd.h	[IA64] Rename platform_name to ia64_platform_name	2012-07-25 11:47:16 -07:00
machvec_hpsim.h	[IA64] Rename platform_name to ia64_platform_name	2012-07-25 11:47:16 -07:00
machvec_hpzx1.h	[IA64] Rename platform_name to ia64_platform_name	2012-07-25 11:47:16 -07:00
machvec_hpzx1_swiotlb.h	[IA64] Rename platform_name to ia64_platform_name	2012-07-25 11:47:16 -07:00
machvec_init.h	…
machvec_sn2.h	[IA64] Rename platform_name to ia64_platform_name	2012-07-25 11:47:16 -07:00
machvec_uv.h	[IA64] Rename platform_name to ia64_platform_name	2012-07-25 11:47:16 -07:00
machvec_xen.h	[IA64] Rename platform_name to ia64_platform_name	2012-07-25 11:47:16 -07:00
mc146818rtc.h	…
mca.h	…
mca_asm.h	Disintegrate asm/system.h for IA64	2012-03-28 18:30:02 +01:00
meminit.h	…
mman.h	UAPI: (Scripted) Disintegrate arch/ia64/include/asm	2012-10-09 09:47:00 +01:00
mmu.h	…
mmu_context.h	…
mmzone.h	…
module.h	Make most arch asm/module.h files use asm-generic/module.h	2012-09-28 14:31:03 +09:30
msidef.h	…
mutex.h	…
nodedata.h	…
numa.h	[IA64] Fix a node distance bug	2012-09-10 14:14:48 -07:00
page.h	Disintegrate asm/system.h for IA64	2012-03-28 18:30:02 +01:00
pal.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
param.h	UAPI: (Scripted) Disintegrate arch/ia64/include/asm	2012-10-09 09:47:00 +01:00
paravirt.h	static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]()	2012-02-24 10:05:59 +01:00
paravirt_patch.h	…
paravirt_privop.h	…
parport.h	…
patch.h	…
pci.h	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
percpu.h	…
perfmon.h	UAPI: (Scripted) Disintegrate arch/ia64/include/asm	2012-10-09 09:47:00 +01:00
pgalloc.h	…
pgtable.h	Disintegrate asm/system.h for IA64	2012-03-28 18:30:02 +01:00
processor.h	[IA64] Rename platform_name to ia64_platform_name	2012-07-25 11:47:16 -07:00
ptrace.h	UAPI: (Scripted) Disintegrate arch/ia64/include/asm	2012-10-09 09:47:00 +01:00
pvclock-abi.h	…
rwsem.h	rwsem: Move duplicate function prototypes to linux/rwsem.h	2011-01-27 12:30:39 +01:00
sal.h	Disintegrate asm/system.h for IA64	2012-03-28 18:30:02 +01:00
scatterlist.h	…
sections.h	…
segment.h	…
serial.h	…
shmparam.h	…
siginfo.h	UAPI: (Scripted) Disintegrate arch/ia64/include/asm	2012-10-09 09:47:00 +01:00
signal.h	UAPI: (Scripted) Disintegrate arch/ia64/include/asm	2012-10-09 09:47:00 +01:00
smp.h	…
sparsemem.h	…
spinlock.h	Disintegrate asm/system.h for IA64	2012-03-28 18:30:02 +01:00
spinlock_types.h	…
string.h	…
swiotlb.h	…
switch_to.h	cputime: Consolidate vtime handling on context switch	2012-08-20 13:05:28 +02:00
sync_bitops.h	…
syscall.h	…
termios.h	UAPI: (Scripted) Disintegrate arch/ia64/include/asm	2012-10-09 09:47:00 +01:00
thread_info.h	sanitize tsk_is_polling()	2012-10-01 09:58:13 -04:00
timex.h	…
tlb.h	ia64: mmu_gather rework	2011-05-25 08:39:15 -07:00
tlbflush.h	…
topology.h	sched/numa: Rewrite the CONFIG_NUMA sched domain support	2012-05-09 15:00:55 +02:00
types.h	UAPI: (Scripted) Disintegrate arch/ia64/include/asm	2012-10-09 09:47:00 +01:00
uaccess.h	…
unaligned.h	…
uncached.h	…
unistd.h	UAPI: (Scripted) Disintegrate arch/ia64/include/asm	2012-10-09 09:47:00 +01:00
unwind.h	…
user.h	…
ustack.h	UAPI: (Scripted) Disintegrate arch/ia64/include/asm	2012-10-09 09:47:00 +01:00
vga.h	…
xor.h	…