linux/include
David Howells f3dfd599af UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k)
The m68k arch doesn't have a kvm_para.h (unlike most or maybe all other
arches), but there is one in asm-generic.  This means that:

	ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
			  $(srctree)/include/asm-$(SRCARCH)/kvm_para.h \
			  $(INSTALL_HDR_PATH)/include/asm-*/kvm_para.h),)
	header-y += kvm_para.h
	endif

gets it wrong because it is invoked twice during the header installation - and
on the second occasion, asm-generic/kvm_para.h has been installed in usr/,
thus triggering a attempt to install asm-m68k/kvm_para.h which will fail.

There are three headers with this sort of conditional logic: a.out.h, kvm.h
and kvm_para.h.  For all three of them, change the logic to be something like:

	ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
			  $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h),)

which finds the header in only the two places it should be found, and doesn't
get incorrectly triggered by the installation of asm-generic's version.

Signed-off-by: David Howells <dhowells@redhat.com>
2012-10-04 18:16:47 +01:00
..
acpi Prepared for main script 2012-10-03 13:45:43 -07:00
asm-generic UAPI: Fix the guards on various asm/unistd.h files 2012-10-04 12:10:18 +01:00
clocksource arm64: Generic timers support 2012-09-17 13:42:20 +01:00
crypto
drm Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-10-03 23:29:23 -07:00
keys
linux UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k) 2012-10-04 18:16:47 +01:00
math-emu
media
memory
misc
mtd
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-10-02 13:38:27 -07:00
pcmcia
ras
rdma IB/core: Add ib_find_exact_cached_pkey() 2012-09-30 20:33:30 -07:00
rxrpc
scsi Prepared for main script 2012-10-03 13:45:43 -07:00
sound UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers 2012-10-02 18:01:25 +01:00
target
trace UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers 2012-10-02 18:01:25 +01:00
uapi UAPI: Plumb the UAPI Kbuilds into the user header installation and checking 2012-10-02 18:01:57 +01:00
video ARM: clps711x: Remove board support for CEIVA 2012-09-28 21:14:08 +02:00
xen Prepared for main script 2012-10-03 13:45:43 -07:00
Kbuild