2 files changed, 50 insertions, 45 deletions
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
index c5d2e5dd871b..d2ee86b4c091 100644
--- a/include/asm-generic/Kbuild.asm
+++ b/include/asm-generic/Kbuild.asm
@@ -1,45 +1 @@
-ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
+include include/uapi/asm-generic/Kbuild.asm
-                  $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
-header-y  += kvm.h
-endif
-ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
-                  $(srctree)/include/asm-$(SRCARCH)/kvm_para.h),)
-header-y  += kvm_para.h
-endif
-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
diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm
new file mode 100644
index 000000000000..fcd50b759217
--- /dev/null
+++ b/include/uapi/asm-generic/Kbuild.asm
@@ -0,0 +1,49 @@
+#
+# Headers that are optional in usr/include/asm/
+#
+opt-header += kvm.h
+opt-header += kvm_para.h
+opt-header += a.out.h
+#
+# Headers that are mandatory in usr/include/asm/
+#
+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,$(opt-header), \
+              $(if \
+                $(wildcard \
+                        $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \
+                        $(srctree)/arch/$(SRCARCH)/include/asm/$(hdr) \
+                ), \
+                $(hdr) \
+                ))

diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm index c5d2e5dd871b..d2ee86b4c091 100644 --- a/include/asm-generic/Kbuild.asm +++ b/include/asm-generic/Kbuild.asm
@@ -1,45 +1 @@
1	ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \		include include/uapi/asm-generic/Kbuild.asm
2	$(srctree)/include/asm-$(SRCARCH)/kvm.h),)
3	header-y += kvm.h
4	endif
5
6	ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
7	$(srctree)/include/asm-$(SRCARCH)/kvm_para.h),)
8	header-y += kvm_para.h
9	endif
10
11	ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
12	$(srctree)/include/asm-$(SRCARCH)/a.out.h),)
13	header-y += a.out.h
14	endif
15
16	header-y += auxvec.h
17	header-y += bitsperlong.h
18	header-y += byteorder.h
19	header-y += errno.h
20	header-y += fcntl.h
21	header-y += ioctl.h
22	header-y += ioctls.h
23	header-y += ipcbuf.h
24	header-y += mman.h
25	header-y += msgbuf.h
26	header-y += param.h
27	header-y += poll.h
28	header-y += posix_types.h
29	header-y += ptrace.h
30	header-y += resource.h
31	header-y += sembuf.h
32	header-y += setup.h
33	header-y += shmbuf.h
34	header-y += sigcontext.h
35	header-y += siginfo.h
36	header-y += signal.h
37	header-y += socket.h
38	header-y += sockios.h
39	header-y += stat.h
40	header-y += statfs.h
41	header-y += swab.h
42	header-y += termbits.h
43	header-y += termios.h
44	header-y += types.h
45	header-y += unistd.h


diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm new file mode 100644 index 000000000000..fcd50b759217 --- /dev/null +++ b/include/uapi/asm-generic/Kbuild.asm
@@ -0,0 +1,49 @@
		1	#
		2	# Headers that are optional in usr/include/asm/
		3	#
		4	opt-header += kvm.h
		5	opt-header += kvm_para.h
		6	opt-header += a.out.h
		7
		8	#
		9	# Headers that are mandatory in usr/include/asm/
		10	#
		11	header-y += auxvec.h
		12	header-y += bitsperlong.h
		13	header-y += byteorder.h
		14	header-y += errno.h
		15	header-y += fcntl.h
		16	header-y += ioctl.h
		17	header-y += ioctls.h
		18	header-y += ipcbuf.h
		19	header-y += mman.h
		20	header-y += msgbuf.h
		21	header-y += param.h
		22	header-y += poll.h
		23	header-y += posix_types.h
		24	header-y += ptrace.h
		25	header-y += resource.h
		26	header-y += sembuf.h
		27	header-y += setup.h
		28	header-y += shmbuf.h
		29	header-y += sigcontext.h
		30	header-y += siginfo.h
		31	header-y += signal.h
		32	header-y += socket.h
		33	header-y += sockios.h
		34	header-y += stat.h
		35	header-y += statfs.h
		36	header-y += swab.h
		37	header-y += termbits.h
		38	header-y += termios.h
		39	header-y += types.h
		40	header-y += unistd.h
		41
		42	header-y += $(foreach hdr,$(opt-header), \
		43	$(if \
		44	$(wildcard \
		45	$(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \
		46	$(srctree)/arch/$(SRCARCH)/include/asm/$(hdr) \
		47	), \
		48	$(hdr) \
		49	))