Set up uapi/asm/Kbuild.asm. This requires the mandatory headers to be dynamically detected. The same goes for include/asm/Kbuild.asm. The problem is that the header files will be split or moved one at a time, but each header file in Kbuild.asm's list applies to all arch headers of that name simultaneously. The dynamic detection of mandatory files can be undone later. Signed-off-by: David Howells <dhowells@xxxxxxxxxx> --- include/asm-generic/Kbuild.asm | 85 +++++++++++++++++------------------ include/uapi/asm-generic/Kbuild.asm | 44 ++++++++++++++++++ 2 files changed, 86 insertions(+), 43 deletions(-) create mode 100644 include/uapi/asm-generic/Kbuild.asm diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm index c5d2e5d..4923b27 100644 --- a/include/asm-generic/Kbuild.asm +++ b/include/asm-generic/Kbuild.asm @@ -1,45 +1,44 @@ -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \ - $(srctree)/include/asm-$(SRCARCH)/kvm.h),) -header-y += kvm.h -endif +# +# Headers that are optional in arch/*/include/asm/ +# +opt-header += kvm.h +opt-header += kvm_para.h +opt-header += a.out.h -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \ - $(srctree)/include/asm-$(SRCARCH)/kvm_para.h),) -header-y += kvm_para.h -endif +# +# Headers that are mandatory in arch/*/include/asm/ +# +asm-headers += auxvec.h +asm-headers += bitsperlong.h +asm-headers += byteorder.h +asm-headers += errno.h +asm-headers += fcntl.h +asm-headers += ioctl.h +asm-headers += ioctls.h +asm-headers += ipcbuf.h +asm-headers += mman.h +asm-headers += msgbuf.h +asm-headers += param.h +asm-headers += poll.h +asm-headers += posix_types.h +asm-headers += ptrace.h +asm-headers += resource.h +asm-headers += sembuf.h +asm-headers += setup.h +asm-headers += shmbuf.h +asm-headers += sigcontext.h +asm-headers += siginfo.h +asm-headers += signal.h +asm-headers += socket.h +asm-headers += sockios.h +asm-headers += stat.h +asm-headers += statfs.h +asm-headers += swab.h +asm-headers += termbits.h +asm-headers += termios.h +asm-headers += types.h +asm-headers += unistd.h -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \ - $(srctree)/include/asm-$(SRCARCH)/a.out.h),) -header-y += a.out.h -endif - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +header-y := $(foreach hdr,$(asm-headers) $(opt-headers), \ + $(if $(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/$(hdr)), \ + $(hdr))) diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm new file mode 100644 index 0000000..5789ed6 --- /dev/null +++ b/include/uapi/asm-generic/Kbuild.asm @@ -0,0 +1,44 @@ +# +# Headers that are optional in arch/*/uapi/asm/ +# +opt-header += kvm.h +opt-header += kvm_para.h +opt-header += a.out.h + +# +# Headers that are mandatory in arch/*/uapi/asm/ +# +asm-headers += auxvec.h +asm-headers += bitsperlong.h +asm-headers += byteorder.h +asm-headers += errno.h +asm-headers += fcntl.h +asm-headers += ioctl.h +asm-headers += ioctls.h +asm-headers += ipcbuf.h +asm-headers += mman.h +asm-headers += msgbuf.h +asm-headers += param.h +asm-headers += poll.h +asm-headers += posix_types.h +asm-headers += ptrace.h +asm-headers += resource.h +asm-headers += sembuf.h +asm-headers += setup.h +asm-headers += shmbuf.h +asm-headers += sigcontext.h +asm-headers += siginfo.h +asm-headers += signal.h +asm-headers += socket.h +asm-headers += sockios.h +asm-headers += stat.h +asm-headers += statfs.h +asm-headers += swab.h +asm-headers += termbits.h +asm-headers += termios.h +asm-headers += types.h +asm-headers += unistd.h + +header-y := $(foreach hdr,$(asm-headers) $(opt-headers), \ + $(if $(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/$(hdr)), \ + $(hdr))) -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
