Since commit fcc8487d477a ("uapi: export all headers under uapi directories"), all (and only) headers under uapi directories are exported, but asm-generic wrappers are still exceptions. To complete de-coupling the uapi from kernel headers, move generic-y of exported headers to uapi/asm/Kbuild. With this change, "make headers_install" will just need to parse uapi/asm/Kbuild to build up exported headers. For arm64, "generic-y += kvm_para.h" is doubled in asm/Kbuild and uapi/asm/Kbuild. So, the one in the former can be simply removed.
Unified · Split
| @@ -6,41 +6,24 @@ generic-y += dma.h · 5 unmodified lines | |||
| 6 | generic-y += dma-contiguous.h | 6 | generic-y += dma-contiguous.h |
| 7 | generic-y += early_ioremap.h | 7 | generic-y += early_ioremap.h |
| 8 | generic-y += emergency-restart.h | 8 | generic-y += emergency-restart.h |
| 9 | generic-y += errno.h | ||
| 10 | generic-y += hw_irq.h | 9 | generic-y += hw_irq.h |
| 11 | generic-y += ioctl.h | ||
| 12 | generic-y += ioctls.h | ||
| 13 | generic-y += ipcbuf.h | ||
| 14 | generic-y += irq_regs.h | 10 | generic-y += irq_regs.h |
| 15 | generic-y += kdebug.h | 11 | generic-y += kdebug.h |
| 16 | generic-y += kmap_types.h | 12 | generic-y += kmap_types.h |
| 17 | generic-y += kvm_para.h | ||
| 18 | generic-y += local.h | 13 | generic-y += local.h |
| 19 | generic-y += local64.h | 14 | generic-y += local64.h |
| 20 | generic-y += mcs_spinlock.h | 15 | generic-y += mcs_spinlock.h |
| 21 | generic-y += mm-arch-hooks.h | 16 | generic-y += mm-arch-hooks.h |
| 22 | generic-y += mman.h | ||
| 23 | generic-y += msgbuf.h | ||
| 24 | generic-y += msi.h | 17 | generic-y += msi.h |
| 25 | generic-y += poll.h | ||
| 26 | generic-y += preempt.h | 18 | generic-y += preempt.h |
| 27 | generic-y += resource.h | ||
| 28 | generic-y += rwsem.h | 19 | generic-y += rwsem.h |
| 29 | generic-y += segment.h | 20 | generic-y += segment.h |
| 30 | generic-y += sembuf.h | ||
| 31 | generic-y += serial.h | 21 | generic-y += serial.h |
| 32 | generic-y += set_memory.h | 22 | generic-y += set_memory.h |
| 33 | generic-y += shmbuf.h | ||
| 34 | generic-y += simd.h | 23 | generic-y += simd.h |
| 35 | generic-y += sizes.h | 24 | generic-y += sizes.h |
| 36 | generic-y += socket.h | ||
| 37 | generic-y += sockios.h | ||
| 38 | generic-y += swab.h | ||
| 39 | generic-y += switch_to.h | 25 | generic-y += switch_to.h |
| 40 | generic-y += termbits.h | ||
| 41 | generic-y += termios.h | ||
| 42 | generic-y += trace_clock.h | 26 | generic-y += trace_clock.h |
| 43 | generic-y += types.h | ||
| 44 | generic-y += unaligned.h | 27 | generic-y += unaligned.h |
| 45 | generic-y += user.h | 28 | generic-y += user.h |
| 46 | generic-y += vga.h | 29 | generic-y += vga.h |
| @@ -1,4 +1,20 @@ | |||
| 1 | # UAPI Header export list | 1 | # UAPI Header export list |
| 2 | include include/uapi/asm-generic/Kbuild.asm | 2 | include include/uapi/asm-generic/Kbuild.asm |
| 3 | 3 | ||
| 4 | generic-y += errno.h | ||
| 5 | generic-y += ioctl.h | ||
| 6 | generic-y += ioctls.h | ||
| 7 | generic-y += ipcbuf.h | ||
| 4 | generic-y += kvm_para.h | 8 | generic-y += kvm_para.h |
| 9 | generic-y += mman.h | ||
| 10 | generic-y += msgbuf.h | ||
| 11 | generic-y += poll.h | ||
| 12 | generic-y += resource.h | ||
| 13 | generic-y += sembuf.h | ||
| 14 | generic-y += shmbuf.h | ||
| 15 | generic-y += socket.h | ||
| 16 | generic-y += sockios.h | ||
| 17 | generic-y += swab.h | ||
| 18 | generic-y += termbits.h | ||
| 19 | generic-y += termios.h | ||
| 20 | generic-y += types.h | ||