leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Khem Raj <raj.khem@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Khem Raj 2008-09-04 23:11:01 -07:00 committed by David Woodhouse
parent 076c7f4c6c
commit afbc8d8e72
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/asm-generic/Kbuild.asm
View File

@ -1,8 +1,10 @@
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 header-y += kvm.h
endif 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 unifdef-y += a.out.h
endif endif
unifdef-y += auxvec.h unifdef-y += auxvec.h

6
include/linux/Kbuild
View File

@ -167,7 +167,8 @@ unifdef-y += acct.h
unifdef-y += adb.h unifdef-y += adb.h
unifdef-y += adfs_fs.h unifdef-y += adfs_fs.h
unifdef-y += agpgart.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 unifdef-y += a.out.h
endif endif
unifdef-y += apm_bios.h unifdef-y += apm_bios.h
@ -258,7 +259,8 @@ unifdef-y += kd.h
unifdef-y += kernelcapi.h unifdef-y += kernelcapi.h
unifdef-y += kernel.h unifdef-y += kernel.h
unifdef-y += keyboard.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 unifdef-y += kvm.h
endif endif
unifdef-y += llc.h unifdef-y += llc.h