Commit afbc8d8e authored by Khem Raj's avatar Khem Raj Committed by David Woodhouse
Browse files

Fix conditional export of kvh.h and a.out.h to userspace. 



Some architectures have moved the asm/ into arch/ and some have not.
This patch checks for a.out.h and kvh.h in both places before exporting
the corresponding file from linux/

[dwmw2: simplified a little]
Signed-off-by: default avatarKhem Raj <raj.khem@gmail.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 076c7f4c

include/asm-generic/Kbuild.asm

+4 −2
Original line number Diff line number Diff line 
ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)

ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \

      		  $(srctree)/include/asm-$(SRCARCH)/kvm.h),)

header-y  += kvm.h

endif



ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)

ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \

      		  $(srctree)/include/asm-$(SRCARCH)/a.out.h),)

unifdef-y += a.out.h

endif

unifdef-y += auxvec.h

include/linux/Kbuild

+4 −2
Original line number Diff line number Diff line
@@ -167,7 +167,8 @@ unifdef-y += acct.h 
unifdef-y += adb.h

unifdef-y += adfs_fs.h

unifdef-y += agpgart.h

ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)

ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \

      		  $(srctree)/include/asm-$(SRCARCH)/a.out.h),)

unifdef-y += a.out.h

endif

unifdef-y += apm_bios.h
@@ -258,7 +259,8 @@ unifdef-y += kd.h 
unifdef-y += kernelcapi.h

unifdef-y += kernel.h

unifdef-y += keyboard.h

ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)

ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \

      		  $(srctree)/include/asm-$(SRCARCH)/kvm.h),)

unifdef-y += kvm.h

endif

unifdef-y += llc.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE