* [PATCH v2 0/3] uapi: add kbuild for some files
@ 2016-12-02 22:53 Stephen Hemminger
2016-12-02 22:53 ` [PATCH 1/3] uapi: export tc tunnel key file Stephen Hemminger
` (2 more replies)
0 siblings, 3 replies; 554+ messages in thread
From: Stephen Hemminger @ 2016-12-02 22:53 UTC (permalink / raw)
To: davem; +Cc: netdev, pablo, jhs, Stephen Hemminger
Some files which are in uapi but not being copied
by make headers_install
Stephen Hemminger (3):
tc: export tunnel key file
uapi: export tc_skbmod.h
uapi: export nf_log.h
include/uapi/linux/netfilter/Kbuild | 1 +
include/uapi/linux/tc_act/Kbuild | 2 ++
2 files changed, 3 insertions(+)
V2 - typo in s/sbkmod/skbmod/
--
2.10.2
^ permalink raw reply [flat|nested] 554+ messages in thread* [PATCH 1/3] uapi: export tc tunnel key file 2016-12-02 22:53 [PATCH v2 0/3] uapi: add kbuild for some files Stephen Hemminger @ 2016-12-02 22:53 ` Stephen Hemminger 2016-12-04 0:21 ` David Miller 2016-12-02 22:53 ` [PATCH 2/3] uapi: export tc_skbmod.h Stephen Hemminger 2016-12-02 22:54 ` [PATCH 3/3] uapi: export nf_log.h Stephen Hemminger 2 siblings, 1 reply; 554+ messages in thread From: Stephen Hemminger @ 2016-12-02 22:53 UTC (permalink / raw) To: davem; +Cc: netdev, pablo, jhs, Stephen Hemminger Fixes commit 21609ae32aaf6c6fab0e ("net/sched: Introduce act_tunnel_key") The file is necessary for iproute2 headers but was not being copied by make install_headers Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com> --- include/uapi/linux/tc_act/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild index e3969bd..9611c7b 100644 --- a/include/uapi/linux/tc_act/Kbuild +++ b/include/uapi/linux/tc_act/Kbuild @@ -11,3 +11,4 @@ header-y += tc_vlan.h header-y += tc_bpf.h header-y += tc_connmark.h header-y += tc_ife.h +header-y += tc_tunnel_key.h -- 2.10.2 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH 1/3] uapi: export tc tunnel key file 2016-12-02 22:53 ` [PATCH 1/3] uapi: export tc tunnel key file Stephen Hemminger @ 2016-12-04 0:21 ` David Miller 0 siblings, 0 replies; 554+ messages in thread From: David Miller @ 2016-12-04 0:21 UTC (permalink / raw) To: stephen; +Cc: netdev, pablo, jhs, sthemmin From: Stephen Hemminger <stephen@networkplumber.org> Date: Fri, 2 Dec 2016 14:53:58 -0800 > Fixes commit 21609ae32aaf6c6fab0e ("net/sched: Introduce act_tunnel_key") > The file is necessary for iproute2 headers but was not being > copied by make install_headers > > Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com> This seems to already be fixed. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH 2/3] uapi: export tc_skbmod.h 2016-12-02 22:53 [PATCH v2 0/3] uapi: add kbuild for some files Stephen Hemminger 2016-12-02 22:53 ` [PATCH 1/3] uapi: export tc tunnel key file Stephen Hemminger @ 2016-12-02 22:53 ` Stephen Hemminger 2016-12-04 0:22 ` David Miller 2016-12-02 22:54 ` [PATCH 3/3] uapi: export nf_log.h Stephen Hemminger 2 siblings, 1 reply; 554+ messages in thread From: Stephen Hemminger @ 2016-12-02 22:53 UTC (permalink / raw) To: davem; +Cc: netdev, pablo, jhs, Stephen Hemminger Fixes commit 735cffe5d800 ("net_sched: Introduce skbmod action") Not used by iproute2 but maybe in future. Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com> --- include/uapi/linux/tc_act/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild index 9611c7b..e3db740 100644 --- a/include/uapi/linux/tc_act/Kbuild +++ b/include/uapi/linux/tc_act/Kbuild @@ -12,3 +12,4 @@ header-y += tc_bpf.h header-y += tc_connmark.h header-y += tc_ife.h header-y += tc_tunnel_key.h +header-y += tc_skbmod.h -- 2.10.2 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH 2/3] uapi: export tc_skbmod.h 2016-12-02 22:53 ` [PATCH 2/3] uapi: export tc_skbmod.h Stephen Hemminger @ 2016-12-04 0:22 ` David Miller 0 siblings, 0 replies; 554+ messages in thread From: David Miller @ 2016-12-04 0:22 UTC (permalink / raw) To: stephen; +Cc: netdev, pablo, jhs, sthemmin From: Stephen Hemminger <stephen@networkplumber.org> Date: Fri, 2 Dec 2016 14:53:59 -0800 > Fixes commit 735cffe5d800 ("net_sched: Introduce skbmod action") > Not used by iproute2 but maybe in future. > > Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com> Applied. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH 3/3] uapi: export nf_log.h 2016-12-02 22:53 [PATCH v2 0/3] uapi: add kbuild for some files Stephen Hemminger 2016-12-02 22:53 ` [PATCH 1/3] uapi: export tc tunnel key file Stephen Hemminger 2016-12-02 22:53 ` [PATCH 2/3] uapi: export tc_skbmod.h Stephen Hemminger @ 2016-12-02 22:54 ` Stephen Hemminger 2016-12-04 0:23 ` David Miller 2 siblings, 1 reply; 554+ messages in thread From: Stephen Hemminger @ 2016-12-02 22:54 UTC (permalink / raw) To: davem; +Cc: netdev, pablo, jhs, Stephen Hemminger File is in uapi directory but not being copied on make install_headers Fixes commit 4ec9c8fbbc22 ("netfilter: nft_log: complete NFTA_LOG_FLAGS attr support"). Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com> --- include/uapi/linux/netfilter/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild index cd26d7a..03f194a 100644 --- a/include/uapi/linux/netfilter/Kbuild +++ b/include/uapi/linux/netfilter/Kbuild @@ -5,6 +5,7 @@ header-y += nf_conntrack_ftp.h header-y += nf_conntrack_sctp.h header-y += nf_conntrack_tcp.h header-y += nf_conntrack_tuple_common.h +header-y += nf_log.h header-y += nf_tables.h header-y += nf_tables_compat.h header-y += nf_nat.h -- 2.10.2 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH 3/3] uapi: export nf_log.h 2016-12-02 22:54 ` [PATCH 3/3] uapi: export nf_log.h Stephen Hemminger @ 2016-12-04 0:23 ` David Miller 2017-01-03 14:35 ` [PATCH] uapi: use wildcards to list files Nicolas Dichtel 2017-01-03 14:35 ` Nicolas Dichtel 0 siblings, 2 replies; 554+ messages in thread From: David Miller @ 2016-12-04 0:23 UTC (permalink / raw) To: stephen; +Cc: netdev, pablo, jhs, sthemmin From: Stephen Hemminger <stephen@networkplumber.org> Date: Fri, 2 Dec 2016 14:54:00 -0800 > File is in uapi directory but not being copied on > make install_headers > > Fixes commit 4ec9c8fbbc22 ("netfilter: nft_log: complete > NFTA_LOG_FLAGS attr support"). > > Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com> Also applied. Someone has to explain to me why we don't simply export every single file under uapi/, it makes no sense to me to have to specify them explicitly. We obviously forget to add the files to the lists all the time. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH] uapi: use wildcards to list files 2016-12-04 0:23 ` David Miller @ 2017-01-03 14:35 ` Nicolas Dichtel 2017-01-03 14:35 ` Nicolas Dichtel 1 sibling, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-03 14:35 UTC (permalink / raw) To: linux-arch, linux-kernel, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, arnd, davem, airlied Cc: nicolas.dichtel Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under include/uapi/ should be exported, so let's use wildcards. After this patch, the following files, which were not exported, are now exported: drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h rdma/qedr-abi.h linux/bcache.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/seg6.h linux/auto_dev-ioctl.h linux/userio.h linux/pr.h linux/wil6210_uapi.h linux/nilfs2_ondisk.h linux/hash_info.h linux/seg6_genl.h linux/seg6_hmac.h linux/batman_adv.h linux/nsfs.h linux/qrtr.h linux/btrfs_tree.h linux/coresight-stm.h linux/dma-buf.h linux/module.h linux/lightnvm.h linux/nilfs2_api.h Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- This patch is built against linus tree. I don't know if it should be done against antoher tree. Comments are welcomed, Nicolas include/uapi/asm-generic/Kbuild | 36 +-- include/uapi/drm/Kbuild | 22 +- include/uapi/linux/Kbuild | 463 +---------------------------- include/uapi/linux/android/Kbuild | 2 +- include/uapi/linux/byteorder/Kbuild | 3 +- include/uapi/linux/caif/Kbuild | 3 +- include/uapi/linux/can/Kbuild | 6 +- include/uapi/linux/dvb/Kbuild | 9 +- include/uapi/linux/hdlc/Kbuild | 2 +- include/uapi/linux/hsi/Kbuild | 2 +- include/uapi/linux/iio/Kbuild | 3 +- include/uapi/linux/isdn/Kbuild | 2 +- include/uapi/linux/mmc/Kbuild | 2 +- include/uapi/linux/netfilter/Kbuild | 88 +----- include/uapi/linux/netfilter/ipset/Kbuild | 5 +- include/uapi/linux/netfilter_arp/Kbuild | 3 +- include/uapi/linux/netfilter_bridge/Kbuild | 18 +- include/uapi/linux/netfilter_ipv4/Kbuild | 10 +- include/uapi/linux/netfilter_ipv6/Kbuild | 13 +- include/uapi/linux/nfsd/Kbuild | 6 +- include/uapi/linux/raid/Kbuild | 3 +- include/uapi/linux/spi/Kbuild | 2 +- include/uapi/linux/sunrpc/Kbuild | 2 +- include/uapi/linux/tc_act/Kbuild | 15 +- include/uapi/linux/tc_ematch/Kbuild | 5 +- include/uapi/linux/usb/Kbuild | 12 +- include/uapi/linux/wimax/Kbuild | 2 +- include/uapi/misc/Kbuild | 2 +- include/uapi/mtd/Kbuild | 6 +- include/uapi/rdma/Kbuild | 17 +- include/uapi/rdma/hfi/Kbuild | 2 +- include/uapi/scsi/Kbuild | 5 +- include/uapi/scsi/fc/Kbuild | 5 +- include/uapi/sound/Kbuild | 16 +- include/uapi/video/Kbuild | 4 +- include/uapi/xen/Kbuild | 5 +- 36 files changed, 47 insertions(+), 754 deletions(-) diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild index b73de7bb7a62..8e52cdc3d941 100644 --- a/include/uapi/asm-generic/Kbuild +++ b/include/uapi/asm-generic/Kbuild @@ -1,36 +1,2 @@ # UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild index 9355dd8eff3b..75f4cde6d9ba 100644 --- a/include/uapi/drm/Kbuild +++ b/include/uapi/drm/Kbuild @@ -1,22 +1,2 @@ # UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/drm/*.h)) diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index a8b93e685239..9d2d4ebc1e5c 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -25,458 +25,19 @@ header-y += wimax/ genhdr-y += version.h -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h +tmphdr-y := $(notdir $(wildcard $(srctree)/include/uapi/linux/*.h)) -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) +tmphdr-y = $(filter-out a.out.h $(tmphdr-y)) endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) +tmphdr-y = $(filter-out kvm.h $(tmphdr-y)) +endif +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) +tmphdr-y = $(filter-out kvm_para.h $(tmphdr-y)) endif -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h +header-y += $(tmphdr-y) diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild index ca011eec252a..37a629f4746a 100644 --- a/include/uapi/linux/android/Kbuild +++ b/include/uapi/linux/android/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += binder.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/android/*.h)) diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild index 619225b9ff2e..d6585c79597c 100644 --- a/include/uapi/linux/byteorder/Kbuild +++ b/include/uapi/linux/byteorder/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/byteorder/*.h)) diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild index 43396612d3a3..0deed17a523c 100644 --- a/include/uapi/linux/caif/Kbuild +++ b/include/uapi/linux/caif/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/caif/*.h)) diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild index 21c91bf25a29..0b7f01ea62d6 100644 --- a/include/uapi/linux/can/Kbuild +++ b/include/uapi/linux/can/Kbuild @@ -1,6 +1,2 @@ # UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/can/*.h)) diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild index d40942cfc627..6845c2b87161 100644 --- a/include/uapi/linux/dvb/Kbuild +++ b/include/uapi/linux/dvb/Kbuild @@ -1,9 +1,2 @@ # UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/dvb/*.h)) diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild index 8c1d2cb75e33..529c2c839277 100644 --- a/include/uapi/linux/hdlc/Kbuild +++ b/include/uapi/linux/hdlc/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += ioctl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/hdlc/*.h)) diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild index a16a00544258..8f59b8f5f8e5 100644 --- a/include/uapi/linux/hsi/Kbuild +++ b/include/uapi/linux/hsi/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += hsi_char.h cs-protocol.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/hsi/*.h)) diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild index 86f76d84c44f..aa6f9887cc4e 100644 --- a/include/uapi/linux/iio/Kbuild +++ b/include/uapi/linux/iio/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += events.h -header-y += types.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/iio/*.h)) diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild index 89e52850bf29..1e842431b0a8 100644 --- a/include/uapi/linux/isdn/Kbuild +++ b/include/uapi/linux/isdn/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += capicmd.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/isdn/*.h)) diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild index 8c1d2cb75e33..02d0c0605d1a 100644 --- a/include/uapi/linux/mmc/Kbuild +++ b/include/uapi/linux/mmc/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += ioctl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/mmc/*.h)) diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild index 03f194aeadc5..a27c332c489c 100644 --- a/include/uapi/linux/netfilter/Kbuild +++ b/include/uapi/linux/netfilter/Kbuild @@ -1,89 +1,3 @@ # UAPI Header export list header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter/*.h)) diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild index d2680423d9ab..b6dc00483ac2 100644 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ b/include/uapi/linux/netfilter/ipset/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter/ipset/*.h)) diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild index 62d5637cc0ac..63b09feaf660 100644 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ b/include/uapi/linux/netfilter_arp/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter_arp/*.h)) diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild index 0fbad8ef96de..6bbfc5a91965 100644 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ b/include/uapi/linux/netfilter_bridge/Kbuild @@ -1,18 +1,2 @@ # UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter_bridge/*.h)) diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild index ecb291df390e..273777606d02 100644 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ b/include/uapi/linux/netfilter_ipv4/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter_ipv4/*.h)) diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild index 75a668ca2353..2d3507f5b0aa 100644 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ b/include/uapi/linux/netfilter_ipv6/Kbuild @@ -1,13 +1,2 @@ # UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter_ipv6/*.h)) diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild index c11bc404053c..b66c1120b54f 100644 --- a/include/uapi/linux/nfsd/Kbuild +++ b/include/uapi/linux/nfsd/Kbuild @@ -1,6 +1,2 @@ # UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/nfsd/*.h)) diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild index e2c3d25405d7..409aa2ecd82f 100644 --- a/include/uapi/linux/raid/Kbuild +++ b/include/uapi/linux/raid/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += md_p.h -header-y += md_u.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/raid/*.h)) diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild index 0cc747eff165..8d269bd5e31a 100644 --- a/include/uapi/linux/spi/Kbuild +++ b/include/uapi/linux/spi/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += spidev.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/spi/*.h)) diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild index 8e02e47c20fb..4a880e5aeba3 100644 --- a/include/uapi/linux/sunrpc/Kbuild +++ b/include/uapi/linux/sunrpc/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += debug.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/sunrpc/*.h)) diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild index e3db7403296f..24f8b1d9a4ed 100644 --- a/include/uapi/linux/tc_act/Kbuild +++ b/include/uapi/linux/tc_act/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/tc_act/*.h)) diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild index 53fca3925535..909ef0d196b1 100644 --- a/include/uapi/linux/tc_ematch/Kbuild +++ b/include/uapi/linux/tc_ematch/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/tc_ematch/*.h)) diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild index 4cc4d6e7e523..4a5eb3f2b704 100644 --- a/include/uapi/linux/usb/Kbuild +++ b/include/uapi/linux/usb/Kbuild @@ -1,12 +1,2 @@ # UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/usb/*.h)) diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild index 1c97be49971f..f9f41558ebbe 100644 --- a/include/uapi/linux/wimax/Kbuild +++ b/include/uapi/linux/wimax/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += i2400m.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/wimax/*.h)) diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild index e96cae7d58c9..c4ad43dfbcfa 100644 --- a/include/uapi/misc/Kbuild +++ b/include/uapi/misc/Kbuild @@ -1,2 +1,2 @@ # misc Header export list -header-y += cxl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/misc/*.h)) diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild index 5a691e10cd0e..0fbbdecf0302 100644 --- a/include/uapi/mtd/Kbuild +++ b/include/uapi/mtd/Kbuild @@ -1,6 +1,2 @@ # UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/mtd/*.h)) diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild index 82bdf5626859..0c51ce6905fb 100644 --- a/include/uapi/rdma/Kbuild +++ b/include/uapi/rdma/Kbuild @@ -1,18 +1,3 @@ # UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/rdma/*.h)) diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild index ef23c294fc71..4fef4d891000 100644 --- a/include/uapi/rdma/hfi/Kbuild +++ b/include/uapi/rdma/hfi/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += hfi1_user.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/rdma/hfi/*.h)) diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild index d791e0ad509d..f3f1df5e24dd 100644 --- a/include/uapi/scsi/Kbuild +++ b/include/uapi/scsi/Kbuild @@ -1,6 +1,3 @@ # UAPI Header export list header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/scsi/*.h)) diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild index 5ead9fac265c..1b84093983c5 100644 --- a/include/uapi/scsi/fc/Kbuild +++ b/include/uapi/scsi/fc/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/scsi/fc/*.h)) diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild index 9578d8bdbf31..d2eb3b2aedf3 100644 --- a/include/uapi/sound/Kbuild +++ b/include/uapi/sound/Kbuild @@ -1,16 +1,2 @@ # UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/sound/*.h)) diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild index ac7203bb32cc..cd6d03c1e7ff 100644 --- a/include/uapi/video/Kbuild +++ b/include/uapi/video/Kbuild @@ -1,4 +1,2 @@ # UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/video/*.h)) diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild index 5c459628e8c7..32feafaaa784 100644 --- a/include/uapi/xen/Kbuild +++ b/include/uapi/xen/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/xen/*.h)) -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH] uapi: use wildcards to list files 2016-12-04 0:23 ` David Miller 2017-01-03 14:35 ` [PATCH] uapi: use wildcards to list files Nicolas Dichtel @ 2017-01-03 14:35 ` Nicolas Dichtel 1 sibling, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-03 14:35 UTC (permalink / raw) To: linux-arch, linux-kernel, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, arnd, davem, airlied Cc: nicolas.dichtel Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under include/uapi/ should be exported, so let's use wildcards. After this patch, the following files, which were not exported, are now exported: drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h rdma/qedr-abi.h linux/bcache.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/seg6.h linux/auto_dev-ioctl.h linux/userio.h linux/pr.h linux/wil6210_uapi.h linux/nilfs2_ondisk.h linux/hash_info.h linux/seg6_genl.h linux/seg6_hmac.h linux/batman_adv.h linux/nsfs.h linux/qrtr.h linux/btrfs_tree.h linux/coresight-stm.h linux/dma-buf.h linux/module.h linux/lightnvm.h linux/nilfs2_api.h Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- This patch is built against linus tree. I don't know if it should be done against antoher tree. Comments are welcomed, Nicolas include/uapi/asm-generic/Kbuild | 36 +-- include/uapi/drm/Kbuild | 22 +- include/uapi/linux/Kbuild | 463 +---------------------------- include/uapi/linux/android/Kbuild | 2 +- include/uapi/linux/byteorder/Kbuild | 3 +- include/uapi/linux/caif/Kbuild | 3 +- include/uapi/linux/can/Kbuild | 6 +- include/uapi/linux/dvb/Kbuild | 9 +- include/uapi/linux/hdlc/Kbuild | 2 +- include/uapi/linux/hsi/Kbuild | 2 +- include/uapi/linux/iio/Kbuild | 3 +- include/uapi/linux/isdn/Kbuild | 2 +- include/uapi/linux/mmc/Kbuild | 2 +- include/uapi/linux/netfilter/Kbuild | 88 +----- include/uapi/linux/netfilter/ipset/Kbuild | 5 +- include/uapi/linux/netfilter_arp/Kbuild | 3 +- include/uapi/linux/netfilter_bridge/Kbuild | 18 +- include/uapi/linux/netfilter_ipv4/Kbuild | 10 +- include/uapi/linux/netfilter_ipv6/Kbuild | 13 +- include/uapi/linux/nfsd/Kbuild | 6 +- include/uapi/linux/raid/Kbuild | 3 +- include/uapi/linux/spi/Kbuild | 2 +- include/uapi/linux/sunrpc/Kbuild | 2 +- include/uapi/linux/tc_act/Kbuild | 15 +- include/uapi/linux/tc_ematch/Kbuild | 5 +- include/uapi/linux/usb/Kbuild | 12 +- include/uapi/linux/wimax/Kbuild | 2 +- include/uapi/misc/Kbuild | 2 +- include/uapi/mtd/Kbuild | 6 +- include/uapi/rdma/Kbuild | 17 +- include/uapi/rdma/hfi/Kbuild | 2 +- include/uapi/scsi/Kbuild | 5 +- include/uapi/scsi/fc/Kbuild | 5 +- include/uapi/sound/Kbuild | 16 +- include/uapi/video/Kbuild | 4 +- include/uapi/xen/Kbuild | 5 +- 36 files changed, 47 insertions(+), 754 deletions(-) diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild index b73de7bb7a62..8e52cdc3d941 100644 --- a/include/uapi/asm-generic/Kbuild +++ b/include/uapi/asm-generic/Kbuild @@ -1,36 +1,2 @@ # UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild index 9355dd8eff3b..75f4cde6d9ba 100644 --- a/include/uapi/drm/Kbuild +++ b/include/uapi/drm/Kbuild @@ -1,22 +1,2 @@ # UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/drm/*.h)) diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index a8b93e685239..9d2d4ebc1e5c 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -25,458 +25,19 @@ header-y += wimax/ genhdr-y += version.h -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h +tmphdr-y := $(notdir $(wildcard $(srctree)/include/uapi/linux/*.h)) -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) +tmphdr-y = $(filter-out a.out.h $(tmphdr-y)) endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) +tmphdr-y = $(filter-out kvm.h $(tmphdr-y)) +endif +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) +tmphdr-y = $(filter-out kvm_para.h $(tmphdr-y)) endif -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h +header-y += $(tmphdr-y) diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild index ca011eec252a..37a629f4746a 100644 --- a/include/uapi/linux/android/Kbuild +++ b/include/uapi/linux/android/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += binder.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/android/*.h)) diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild index 619225b9ff2e..d6585c79597c 100644 --- a/include/uapi/linux/byteorder/Kbuild +++ b/include/uapi/linux/byteorder/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/byteorder/*.h)) diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild index 43396612d3a3..0deed17a523c 100644 --- a/include/uapi/linux/caif/Kbuild +++ b/include/uapi/linux/caif/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/caif/*.h)) diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild index 21c91bf25a29..0b7f01ea62d6 100644 --- a/include/uapi/linux/can/Kbuild +++ b/include/uapi/linux/can/Kbuild @@ -1,6 +1,2 @@ # UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/can/*.h)) diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild index d40942cfc627..6845c2b87161 100644 --- a/include/uapi/linux/dvb/Kbuild +++ b/include/uapi/linux/dvb/Kbuild @@ -1,9 +1,2 @@ # UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/dvb/*.h)) diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild index 8c1d2cb75e33..529c2c839277 100644 --- a/include/uapi/linux/hdlc/Kbuild +++ b/include/uapi/linux/hdlc/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += ioctl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/hdlc/*.h)) diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild index a16a00544258..8f59b8f5f8e5 100644 --- a/include/uapi/linux/hsi/Kbuild +++ b/include/uapi/linux/hsi/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += hsi_char.h cs-protocol.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/hsi/*.h)) diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild index 86f76d84c44f..aa6f9887cc4e 100644 --- a/include/uapi/linux/iio/Kbuild +++ b/include/uapi/linux/iio/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += events.h -header-y += types.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/iio/*.h)) diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild index 89e52850bf29..1e842431b0a8 100644 --- a/include/uapi/linux/isdn/Kbuild +++ b/include/uapi/linux/isdn/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += capicmd.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/isdn/*.h)) diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild index 8c1d2cb75e33..02d0c0605d1a 100644 --- a/include/uapi/linux/mmc/Kbuild +++ b/include/uapi/linux/mmc/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += ioctl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/mmc/*.h)) diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild index 03f194aeadc5..a27c332c489c 100644 --- a/include/uapi/linux/netfilter/Kbuild +++ b/include/uapi/linux/netfilter/Kbuild @@ -1,89 +1,3 @@ # UAPI Header export list header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter/*.h)) diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild index d2680423d9ab..b6dc00483ac2 100644 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ b/include/uapi/linux/netfilter/ipset/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter/ipset/*.h)) diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild index 62d5637cc0ac..63b09feaf660 100644 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ b/include/uapi/linux/netfilter_arp/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter_arp/*.h)) diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild index 0fbad8ef96de..6bbfc5a91965 100644 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ b/include/uapi/linux/netfilter_bridge/Kbuild @@ -1,18 +1,2 @@ # UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter_bridge/*.h)) diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild index ecb291df390e..273777606d02 100644 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ b/include/uapi/linux/netfilter_ipv4/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter_ipv4/*.h)) diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild index 75a668ca2353..2d3507f5b0aa 100644 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ b/include/uapi/linux/netfilter_ipv6/Kbuild @@ -1,13 +1,2 @@ # UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter_ipv6/*.h)) diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild index c11bc404053c..b66c1120b54f 100644 --- a/include/uapi/linux/nfsd/Kbuild +++ b/include/uapi/linux/nfsd/Kbuild @@ -1,6 +1,2 @@ # UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/nfsd/*.h)) diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild index e2c3d25405d7..409aa2ecd82f 100644 --- a/include/uapi/linux/raid/Kbuild +++ b/include/uapi/linux/raid/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += md_p.h -header-y += md_u.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/raid/*.h)) diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild index 0cc747eff165..8d269bd5e31a 100644 --- a/include/uapi/linux/spi/Kbuild +++ b/include/uapi/linux/spi/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += spidev.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/spi/*.h)) diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild index 8e02e47c20fb..4a880e5aeba3 100644 --- a/include/uapi/linux/sunrpc/Kbuild +++ b/include/uapi/linux/sunrpc/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += debug.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/sunrpc/*.h)) diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild index e3db7403296f..24f8b1d9a4ed 100644 --- a/include/uapi/linux/tc_act/Kbuild +++ b/include/uapi/linux/tc_act/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/tc_act/*.h)) diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild index 53fca3925535..909ef0d196b1 100644 --- a/include/uapi/linux/tc_ematch/Kbuild +++ b/include/uapi/linux/tc_ematch/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/tc_ematch/*.h)) diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild index 4cc4d6e7e523..4a5eb3f2b704 100644 --- a/include/uapi/linux/usb/Kbuild +++ b/include/uapi/linux/usb/Kbuild @@ -1,12 +1,2 @@ # UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/usb/*.h)) diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild index 1c97be49971f..f9f41558ebbe 100644 --- a/include/uapi/linux/wimax/Kbuild +++ b/include/uapi/linux/wimax/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += i2400m.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/wimax/*.h)) diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild index e96cae7d58c9..c4ad43dfbcfa 100644 --- a/include/uapi/misc/Kbuild +++ b/include/uapi/misc/Kbuild @@ -1,2 +1,2 @@ # misc Header export list -header-y += cxl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/misc/*.h)) diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild index 5a691e10cd0e..0fbbdecf0302 100644 --- a/include/uapi/mtd/Kbuild +++ b/include/uapi/mtd/Kbuild @@ -1,6 +1,2 @@ # UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/mtd/*.h)) diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild index 82bdf5626859..0c51ce6905fb 100644 --- a/include/uapi/rdma/Kbuild +++ b/include/uapi/rdma/Kbuild @@ -1,18 +1,3 @@ # UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/rdma/*.h)) diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild index ef23c294fc71..4fef4d891000 100644 --- a/include/uapi/rdma/hfi/Kbuild +++ b/include/uapi/rdma/hfi/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += hfi1_user.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/rdma/hfi/*.h)) diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild index d791e0ad509d..f3f1df5e24dd 100644 --- a/include/uapi/scsi/Kbuild +++ b/include/uapi/scsi/Kbuild @@ -1,6 +1,3 @@ # UAPI Header export list header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/scsi/*.h)) diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild index 5ead9fac265c..1b84093983c5 100644 --- a/include/uapi/scsi/fc/Kbuild +++ b/include/uapi/scsi/fc/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/scsi/fc/*.h)) diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild index 9578d8bdbf31..d2eb3b2aedf3 100644 --- a/include/uapi/sound/Kbuild +++ b/include/uapi/sound/Kbuild @@ -1,16 +1,2 @@ # UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/sound/*.h)) diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild index ac7203bb32cc..cd6d03c1e7ff 100644 --- a/include/uapi/video/Kbuild +++ b/include/uapi/video/Kbuild @@ -1,4 +1,2 @@ # UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/video/*.h)) diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild index 5c459628e8c7..32feafaaa784 100644 --- a/include/uapi/xen/Kbuild +++ b/include/uapi/xen/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/xen/*.h)) -- 2.8.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/ ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH] uapi: use wildcards to list files @ 2017-01-03 14:35 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-03 14:35 UTC (permalink / raw) To: linux-arch, linux-kernel, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, arnd, davem, airlied Cc: nicolas.dichtel Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under include/uapi/ should be exported, so let's use wildcards. After this patch, the following files, which were not exported, are now exported: drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h rdma/qedr-abi.h linux/bcache.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/seg6.h linux/auto_dev-ioctl.h linux/userio.h linux/pr.h linux/wil6210_uapi.h linux/nilfs2_ondisk.h linux/hash_info.h linux/seg6_genl.h linux/seg6_hmac.h linux/batman_adv.h linux/nsfs.h linux/qrtr.h linux/btrfs_tree.h linux/coresight-stm.h linux/dma-buf.h linux/module.h linux/lightnvm.h linux/nilfs2_api.h Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- This patch is built against linus tree. I don't know if it should be done against antoher tree. Comments are welcomed, Nicolas include/uapi/asm-generic/Kbuild | 36 +-- include/uapi/drm/Kbuild | 22 +- include/uapi/linux/Kbuild | 463 +---------------------------- include/uapi/linux/android/Kbuild | 2 +- include/uapi/linux/byteorder/Kbuild | 3 +- include/uapi/linux/caif/Kbuild | 3 +- include/uapi/linux/can/Kbuild | 6 +- include/uapi/linux/dvb/Kbuild | 9 +- include/uapi/linux/hdlc/Kbuild | 2 +- include/uapi/linux/hsi/Kbuild | 2 +- include/uapi/linux/iio/Kbuild | 3 +- include/uapi/linux/isdn/Kbuild | 2 +- include/uapi/linux/mmc/Kbuild | 2 +- include/uapi/linux/netfilter/Kbuild | 88 +----- include/uapi/linux/netfilter/ipset/Kbuild | 5 +- include/uapi/linux/netfilter_arp/Kbuild | 3 +- include/uapi/linux/netfilter_bridge/Kbuild | 18 +- include/uapi/linux/netfilter_ipv4/Kbuild | 10 +- include/uapi/linux/netfilter_ipv6/Kbuild | 13 +- include/uapi/linux/nfsd/Kbuild | 6 +- include/uapi/linux/raid/Kbuild | 3 +- include/uapi/linux/spi/Kbuild | 2 +- include/uapi/linux/sunrpc/Kbuild | 2 +- include/uapi/linux/tc_act/Kbuild | 15 +- include/uapi/linux/tc_ematch/Kbuild | 5 +- include/uapi/linux/usb/Kbuild | 12 +- include/uapi/linux/wimax/Kbuild | 2 +- include/uapi/misc/Kbuild | 2 +- include/uapi/mtd/Kbuild | 6 +- include/uapi/rdma/Kbuild | 17 +- include/uapi/rdma/hfi/Kbuild | 2 +- include/uapi/scsi/Kbuild | 5 +- include/uapi/scsi/fc/Kbuild | 5 +- include/uapi/sound/Kbuild | 16 +- include/uapi/video/Kbuild | 4 +- include/uapi/xen/Kbuild | 5 +- 36 files changed, 47 insertions(+), 754 deletions(-) diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild index b73de7bb7a62..8e52cdc3d941 100644 --- a/include/uapi/asm-generic/Kbuild +++ b/include/uapi/asm-generic/Kbuild @@ -1,36 +1,2 @@ # UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild index 9355dd8eff3b..75f4cde6d9ba 100644 --- a/include/uapi/drm/Kbuild +++ b/include/uapi/drm/Kbuild @@ -1,22 +1,2 @@ # UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/drm/*.h)) diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index a8b93e685239..9d2d4ebc1e5c 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -25,458 +25,19 @@ header-y += wimax/ genhdr-y += version.h -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h +tmphdr-y := $(notdir $(wildcard $(srctree)/include/uapi/linux/*.h)) -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) +tmphdr-y = $(filter-out a.out.h $(tmphdr-y)) endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) +tmphdr-y = $(filter-out kvm.h $(tmphdr-y)) +endif +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) +tmphdr-y = $(filter-out kvm_para.h $(tmphdr-y)) endif -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h +header-y += $(tmphdr-y) diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild index ca011eec252a..37a629f4746a 100644 --- a/include/uapi/linux/android/Kbuild +++ b/include/uapi/linux/android/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += binder.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/android/*.h)) diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild index 619225b9ff2e..d6585c79597c 100644 --- a/include/uapi/linux/byteorder/Kbuild +++ b/include/uapi/linux/byteorder/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/byteorder/*.h)) diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild index 43396612d3a3..0deed17a523c 100644 --- a/include/uapi/linux/caif/Kbuild +++ b/include/uapi/linux/caif/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/caif/*.h)) diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild index 21c91bf25a29..0b7f01ea62d6 100644 --- a/include/uapi/linux/can/Kbuild +++ b/include/uapi/linux/can/Kbuild @@ -1,6 +1,2 @@ # UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/can/*.h)) diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild index d40942cfc627..6845c2b87161 100644 --- a/include/uapi/linux/dvb/Kbuild +++ b/include/uapi/linux/dvb/Kbuild @@ -1,9 +1,2 @@ # UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/dvb/*.h)) diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild index 8c1d2cb75e33..529c2c839277 100644 --- a/include/uapi/linux/hdlc/Kbuild +++ b/include/uapi/linux/hdlc/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += ioctl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/hdlc/*.h)) diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild index a16a00544258..8f59b8f5f8e5 100644 --- a/include/uapi/linux/hsi/Kbuild +++ b/include/uapi/linux/hsi/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += hsi_char.h cs-protocol.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/hsi/*.h)) diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild index 86f76d84c44f..aa6f9887cc4e 100644 --- a/include/uapi/linux/iio/Kbuild +++ b/include/uapi/linux/iio/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += events.h -header-y += types.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/iio/*.h)) diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild index 89e52850bf29..1e842431b0a8 100644 --- a/include/uapi/linux/isdn/Kbuild +++ b/include/uapi/linux/isdn/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += capicmd.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/isdn/*.h)) diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild index 8c1d2cb75e33..02d0c0605d1a 100644 --- a/include/uapi/linux/mmc/Kbuild +++ b/include/uapi/linux/mmc/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += ioctl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/mmc/*.h)) diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild index 03f194aeadc5..a27c332c489c 100644 --- a/include/uapi/linux/netfilter/Kbuild +++ b/include/uapi/linux/netfilter/Kbuild @@ -1,89 +1,3 @@ # UAPI Header export list header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter/*.h)) diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild index d2680423d9ab..b6dc00483ac2 100644 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ b/include/uapi/linux/netfilter/ipset/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter/ipset/*.h)) diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild index 62d5637cc0ac..63b09feaf660 100644 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ b/include/uapi/linux/netfilter_arp/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter_arp/*.h)) diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild index 0fbad8ef96de..6bbfc5a91965 100644 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ b/include/uapi/linux/netfilter_bridge/Kbuild @@ -1,18 +1,2 @@ # UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter_bridge/*.h)) diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild index ecb291df390e..273777606d02 100644 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ b/include/uapi/linux/netfilter_ipv4/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter_ipv4/*.h)) diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild index 75a668ca2353..2d3507f5b0aa 100644 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ b/include/uapi/linux/netfilter_ipv6/Kbuild @@ -1,13 +1,2 @@ # UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter_ipv6/*.h)) diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild index c11bc404053c..b66c1120b54f 100644 --- a/include/uapi/linux/nfsd/Kbuild +++ b/include/uapi/linux/nfsd/Kbuild @@ -1,6 +1,2 @@ # UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/nfsd/*.h)) diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild index e2c3d25405d7..409aa2ecd82f 100644 --- a/include/uapi/linux/raid/Kbuild +++ b/include/uapi/linux/raid/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += md_p.h -header-y += md_u.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/raid/*.h)) diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild index 0cc747eff165..8d269bd5e31a 100644 --- a/include/uapi/linux/spi/Kbuild +++ b/include/uapi/linux/spi/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += spidev.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/spi/*.h)) diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild index 8e02e47c20fb..4a880e5aeba3 100644 --- a/include/uapi/linux/sunrpc/Kbuild +++ b/include/uapi/linux/sunrpc/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += debug.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/sunrpc/*.h)) diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild index e3db7403296f..24f8b1d9a4ed 100644 --- a/include/uapi/linux/tc_act/Kbuild +++ b/include/uapi/linux/tc_act/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/tc_act/*.h)) diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild index 53fca3925535..909ef0d196b1 100644 --- a/include/uapi/linux/tc_ematch/Kbuild +++ b/include/uapi/linux/tc_ematch/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/tc_ematch/*.h)) diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild index 4cc4d6e7e523..4a5eb3f2b704 100644 --- a/include/uapi/linux/usb/Kbuild +++ b/include/uapi/linux/usb/Kbuild @@ -1,12 +1,2 @@ # UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/usb/*.h)) diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild index 1c97be49971f..f9f41558ebbe 100644 --- a/include/uapi/linux/wimax/Kbuild +++ b/include/uapi/linux/wimax/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += i2400m.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/wimax/*.h)) diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild index e96cae7d58c9..c4ad43dfbcfa 100644 --- a/include/uapi/misc/Kbuild +++ b/include/uapi/misc/Kbuild @@ -1,2 +1,2 @@ # misc Header export list -header-y += cxl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/misc/*.h)) diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild index 5a691e10cd0e..0fbbdecf0302 100644 --- a/include/uapi/mtd/Kbuild +++ b/include/uapi/mtd/Kbuild @@ -1,6 +1,2 @@ # UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/mtd/*.h)) diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild index 82bdf5626859..0c51ce6905fb 100644 --- a/include/uapi/rdma/Kbuild +++ b/include/uapi/rdma/Kbuild @@ -1,18 +1,3 @@ # UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/rdma/*.h)) diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild index ef23c294fc71..4fef4d891000 100644 --- a/include/uapi/rdma/hfi/Kbuild +++ b/include/uapi/rdma/hfi/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += hfi1_user.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/rdma/hfi/*.h)) diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild index d791e0ad509d..f3f1df5e24dd 100644 --- a/include/uapi/scsi/Kbuild +++ b/include/uapi/scsi/Kbuild @@ -1,6 +1,3 @@ # UAPI Header export list header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/scsi/*.h)) diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild index 5ead9fac265c..1b84093983c5 100644 --- a/include/uapi/scsi/fc/Kbuild +++ b/include/uapi/scsi/fc/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/scsi/fc/*.h)) diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild index 9578d8bdbf31..d2eb3b2aedf3 100644 --- a/include/uapi/sound/Kbuild +++ b/include/uapi/sound/Kbuild @@ -1,16 +1,2 @@ # UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/sound/*.h)) diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild index ac7203bb32cc..cd6d03c1e7ff 100644 --- a/include/uapi/video/Kbuild +++ b/include/uapi/video/Kbuild @@ -1,4 +1,2 @@ # UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/video/*.h)) diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild index 5c459628e8c7..32feafaaa784 100644 --- a/include/uapi/xen/Kbuild +++ b/include/uapi/xen/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/xen/*.h)) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH] uapi: use wildcards to list files @ 2017-01-03 14:35 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-03 14:35 UTC (permalink / raw) To: linux-arch, linux-kernel, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, arnd, davem, airlied Cc: nicolas.dichtel Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under include/uapi/ should be exported, so let's use wildcards. After this patch, the following files, which were not exported, are now exported: drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h rdma/qedr-abi.h linux/bcache.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/seg6.h linux/auto_dev-ioctl.h linux/userio.h linux/pr.h linux/wil6210_uapi.h linux/nilfs2_ondisk.h linux/hash_info.h linux/seg6_genl.h linux/seg6_hmac.h linux/batman_adv.h linux/nsfs.h linux/qrtr.h linux/btrfs_tree.h linux/coresight-stm.h linux/dma-buf.h linux/module.h linux/lightnvm.h linux/nilfs2_api.h Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- This patch is built against linus tree. I don't know if it should be done against antoher tree. Comments are welcomed, Nicolas include/uapi/asm-generic/Kbuild | 36 +-- include/uapi/drm/Kbuild | 22 +- include/uapi/linux/Kbuild | 463 +---------------------------- include/uapi/linux/android/Kbuild | 2 +- include/uapi/linux/byteorder/Kbuild | 3 +- include/uapi/linux/caif/Kbuild | 3 +- include/uapi/linux/can/Kbuild | 6 +- include/uapi/linux/dvb/Kbuild | 9 +- include/uapi/linux/hdlc/Kbuild | 2 +- include/uapi/linux/hsi/Kbuild | 2 +- include/uapi/linux/iio/Kbuild | 3 +- include/uapi/linux/isdn/Kbuild | 2 +- include/uapi/linux/mmc/Kbuild | 2 +- include/uapi/linux/netfilter/Kbuild | 88 +----- include/uapi/linux/netfilter/ipset/Kbuild | 5 +- include/uapi/linux/netfilter_arp/Kbuild | 3 +- include/uapi/linux/netfilter_bridge/Kbuild | 18 +- include/uapi/linux/netfilter_ipv4/Kbuild | 10 +- include/uapi/linux/netfilter_ipv6/Kbuild | 13 +- include/uapi/linux/nfsd/Kbuild | 6 +- include/uapi/linux/raid/Kbuild | 3 +- include/uapi/linux/spi/Kbuild | 2 +- include/uapi/linux/sunrpc/Kbuild | 2 +- include/uapi/linux/tc_act/Kbuild | 15 +- include/uapi/linux/tc_ematch/Kbuild | 5 +- include/uapi/linux/usb/Kbuild | 12 +- include/uapi/linux/wimax/Kbuild | 2 +- include/uapi/misc/Kbuild | 2 +- include/uapi/mtd/Kbuild | 6 +- include/uapi/rdma/Kbuild | 17 +- include/uapi/rdma/hfi/Kbuild | 2 +- include/uapi/scsi/Kbuild | 5 +- include/uapi/scsi/fc/Kbuild | 5 +- include/uapi/sound/Kbuild | 16 +- include/uapi/video/Kbuild | 4 +- include/uapi/xen/Kbuild | 5 +- 36 files changed, 47 insertions(+), 754 deletions(-) diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild index b73de7bb7a62..8e52cdc3d941 100644 --- a/include/uapi/asm-generic/Kbuild +++ b/include/uapi/asm-generic/Kbuild @@ -1,36 +1,2 @@ # UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild index 9355dd8eff3b..75f4cde6d9ba 100644 --- a/include/uapi/drm/Kbuild +++ b/include/uapi/drm/Kbuild @@ -1,22 +1,2 @@ # UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/drm/*.h)) diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index a8b93e685239..9d2d4ebc1e5c 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -25,458 +25,19 @@ header-y += wimax/ genhdr-y += version.h -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h +tmphdr-y := $(notdir $(wildcard $(srctree)/include/uapi/linux/*.h)) -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) +tmphdr-y = $(filter-out a.out.h $(tmphdr-y)) endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) +tmphdr-y = $(filter-out kvm.h $(tmphdr-y)) +endif +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) +tmphdr-y = $(filter-out kvm_para.h $(tmphdr-y)) endif -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h +header-y += $(tmphdr-y) diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild index ca011eec252a..37a629f4746a 100644 --- a/include/uapi/linux/android/Kbuild +++ b/include/uapi/linux/android/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += binder.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/android/*.h)) diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild index 619225b9ff2e..d6585c79597c 100644 --- a/include/uapi/linux/byteorder/Kbuild +++ b/include/uapi/linux/byteorder/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/byteorder/*.h)) diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild index 43396612d3a3..0deed17a523c 100644 --- a/include/uapi/linux/caif/Kbuild +++ b/include/uapi/linux/caif/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/caif/*.h)) diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild index 21c91bf25a29..0b7f01ea62d6 100644 --- a/include/uapi/linux/can/Kbuild +++ b/include/uapi/linux/can/Kbuild @@ -1,6 +1,2 @@ # UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/can/*.h)) diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild index d40942cfc627..6845c2b87161 100644 --- a/include/uapi/linux/dvb/Kbuild +++ b/include/uapi/linux/dvb/Kbuild @@ -1,9 +1,2 @@ # UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/dvb/*.h)) diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild index 8c1d2cb75e33..529c2c839277 100644 --- a/include/uapi/linux/hdlc/Kbuild +++ b/include/uapi/linux/hdlc/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += ioctl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/hdlc/*.h)) diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild index a16a00544258..8f59b8f5f8e5 100644 --- a/include/uapi/linux/hsi/Kbuild +++ b/include/uapi/linux/hsi/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += hsi_char.h cs-protocol.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/hsi/*.h)) diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild index 86f76d84c44f..aa6f9887cc4e 100644 --- a/include/uapi/linux/iio/Kbuild +++ b/include/uapi/linux/iio/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += events.h -header-y += types.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/iio/*.h)) diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild index 89e52850bf29..1e842431b0a8 100644 --- a/include/uapi/linux/isdn/Kbuild +++ b/include/uapi/linux/isdn/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += capicmd.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/isdn/*.h)) diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild index 8c1d2cb75e33..02d0c0605d1a 100644 --- a/include/uapi/linux/mmc/Kbuild +++ b/include/uapi/linux/mmc/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += ioctl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/mmc/*.h)) diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild index 03f194aeadc5..a27c332c489c 100644 --- a/include/uapi/linux/netfilter/Kbuild +++ b/include/uapi/linux/netfilter/Kbuild @@ -1,89 +1,3 @@ # UAPI Header export list header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter/*.h)) diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild index d2680423d9ab..b6dc00483ac2 100644 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ b/include/uapi/linux/netfilter/ipset/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter/ipset/*.h)) diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild index 62d5637cc0ac..63b09feaf660 100644 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ b/include/uapi/linux/netfilter_arp/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter_arp/*.h)) diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild index 0fbad8ef96de..6bbfc5a91965 100644 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ b/include/uapi/linux/netfilter_bridge/Kbuild @@ -1,18 +1,2 @@ # UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter_bridge/*.h)) diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild index ecb291df390e..273777606d02 100644 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ b/include/uapi/linux/netfilter_ipv4/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter_ipv4/*.h)) diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild index 75a668ca2353..2d3507f5b0aa 100644 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ b/include/uapi/linux/netfilter_ipv6/Kbuild @@ -1,13 +1,2 @@ # UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/netfilter_ipv6/*.h)) diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild index c11bc404053c..b66c1120b54f 100644 --- a/include/uapi/linux/nfsd/Kbuild +++ b/include/uapi/linux/nfsd/Kbuild @@ -1,6 +1,2 @@ # UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/nfsd/*.h)) diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild index e2c3d25405d7..409aa2ecd82f 100644 --- a/include/uapi/linux/raid/Kbuild +++ b/include/uapi/linux/raid/Kbuild @@ -1,3 +1,2 @@ # UAPI Header export list -header-y += md_p.h -header-y += md_u.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/raid/*.h)) diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild index 0cc747eff165..8d269bd5e31a 100644 --- a/include/uapi/linux/spi/Kbuild +++ b/include/uapi/linux/spi/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += spidev.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/spi/*.h)) diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild index 8e02e47c20fb..4a880e5aeba3 100644 --- a/include/uapi/linux/sunrpc/Kbuild +++ b/include/uapi/linux/sunrpc/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += debug.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/sunrpc/*.h)) diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild index e3db7403296f..24f8b1d9a4ed 100644 --- a/include/uapi/linux/tc_act/Kbuild +++ b/include/uapi/linux/tc_act/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/tc_act/*.h)) diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild index 53fca3925535..909ef0d196b1 100644 --- a/include/uapi/linux/tc_ematch/Kbuild +++ b/include/uapi/linux/tc_ematch/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/tc_ematch/*.h)) diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild index 4cc4d6e7e523..4a5eb3f2b704 100644 --- a/include/uapi/linux/usb/Kbuild +++ b/include/uapi/linux/usb/Kbuild @@ -1,12 +1,2 @@ # UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/usb/*.h)) diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild index 1c97be49971f..f9f41558ebbe 100644 --- a/include/uapi/linux/wimax/Kbuild +++ b/include/uapi/linux/wimax/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += i2400m.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/linux/wimax/*.h)) diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild index e96cae7d58c9..c4ad43dfbcfa 100644 --- a/include/uapi/misc/Kbuild +++ b/include/uapi/misc/Kbuild @@ -1,2 +1,2 @@ # misc Header export list -header-y += cxl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/misc/*.h)) diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild index 5a691e10cd0e..0fbbdecf0302 100644 --- a/include/uapi/mtd/Kbuild +++ b/include/uapi/mtd/Kbuild @@ -1,6 +1,2 @@ # UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/mtd/*.h)) diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild index 82bdf5626859..0c51ce6905fb 100644 --- a/include/uapi/rdma/Kbuild +++ b/include/uapi/rdma/Kbuild @@ -1,18 +1,3 @@ # UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/rdma/*.h)) diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild index ef23c294fc71..4fef4d891000 100644 --- a/include/uapi/rdma/hfi/Kbuild +++ b/include/uapi/rdma/hfi/Kbuild @@ -1,2 +1,2 @@ # UAPI Header export list -header-y += hfi1_user.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/rdma/hfi/*.h)) diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild index d791e0ad509d..f3f1df5e24dd 100644 --- a/include/uapi/scsi/Kbuild +++ b/include/uapi/scsi/Kbuild @@ -1,6 +1,3 @@ # UAPI Header export list header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/scsi/*.h)) diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild index 5ead9fac265c..1b84093983c5 100644 --- a/include/uapi/scsi/fc/Kbuild +++ b/include/uapi/scsi/fc/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/scsi/fc/*.h)) diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild index 9578d8bdbf31..d2eb3b2aedf3 100644 --- a/include/uapi/sound/Kbuild +++ b/include/uapi/sound/Kbuild @@ -1,16 +1,2 @@ # UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/sound/*.h)) diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild index ac7203bb32cc..cd6d03c1e7ff 100644 --- a/include/uapi/video/Kbuild +++ b/include/uapi/video/Kbuild @@ -1,4 +1,2 @@ # UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/video/*.h)) diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild index 5c459628e8c7..32feafaaa784 100644 --- a/include/uapi/xen/Kbuild +++ b/include/uapi/xen/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h +header-y += $(notdir $(wildcard $(srctree)/include/uapi/xen/*.h)) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH] uapi: use wildcards to list files 2017-01-03 14:35 ` Nicolas Dichtel (?) @ 2017-01-03 15:56 ` David Miller -1 siblings, 0 replies; 554+ messages in thread From: David Miller @ 2017-01-03 15:56 UTC (permalink / raw) To: nicolas.dichtel Cc: linux-arch, linux-nfs, arnd, alsa-devel, linux-rdma, netdev, linux-mmc, linux-kernel, dri-devel, linux-spi, linux-raid, airlied, netfilter-devel, linux-fbdev, xen-devel, fcoe-devel, linux-mtd, linux-media From: Nicolas Dichtel <nicolas.dichtel@6wind.com> Date: Tue, 3 Jan 2017 15:35:44 +0100 > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under include/uapi/ should be exported, so let's > use wildcards. > > After this patch, the following files, which were not exported, are now > exported: ... > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: David S. Miller <davem@davemloft.net> _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH] uapi: use wildcards to list files @ 2017-01-03 15:56 ` David Miller 0 siblings, 0 replies; 554+ messages in thread From: David Miller @ 2017-01-03 15:56 UTC (permalink / raw) To: nicolas.dichtel Cc: linux-arch, linux-nfs, arnd, alsa-devel, linux-rdma, netdev, linux-mmc, linux-kernel, dri-devel, linux-spi, linux-raid, airlied, netfilter-devel, linux-fbdev, xen-devel, fcoe-devel, linux-mtd, linux-media From: Nicolas Dichtel <nicolas.dichtel@6wind.com> Date: Tue, 3 Jan 2017 15:35:44 +0100 > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under include/uapi/ should be exported, so let's > use wildcards. > > After this patch, the following files, which were not exported, are now > exported: ... > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: David S. Miller <davem@davemloft.net> ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH] uapi: use wildcards to list files @ 2017-01-03 15:56 ` David Miller 0 siblings, 0 replies; 554+ messages in thread From: David Miller @ 2017-01-03 15:56 UTC (permalink / raw) To: nicolas.dichtel Cc: linux-arch, linux-kernel, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, arnd, airlied From: Nicolas Dichtel <nicolas.dichtel@6wind.com> Date: Tue, 3 Jan 2017 15:35:44 +0100 > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under include/uapi/ should be exported, so let's > use wildcards. > > After this patch, the following files, which were not exported, are now > exported: ... > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: David S. Miller <davem@davemloft.net> ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH] uapi: use wildcards to list files 2017-01-03 14:35 ` Nicolas Dichtel ` (2 preceding siblings ...) (?) @ 2017-01-03 21:37 ` Arnd Bergmann -1 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-03 21:37 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-arch, David Howells, linux-nfs, alsa-devel, linux-rdma, netdev, linux-mmc, linux-kernel, dri-devel, linux-spi, linux-raid, airlied, netfilter-devel, linux-fbdev, xen-devel, fcoe-devel, linux-mtd, davem, linux-media On Tuesday, January 3, 2017 3:35:44 PM CET Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under include/uapi/ should be exported, so let's > use wildcards. I think the idea makes a lot of sense: if a header is in uapi, we should really export it. However, using a wildcard expression seems a bit backwards here, I think we should make this implicit and not have the Kbuild file at all. The "header-y" syntax was originally added back when the uapi headers were mixed with the internal headers in the same directory. After David Howells introduced the separate directory for uapi, it has become a bit redundant. Can you try to modify scripts/Makefile.headersinst instead so we can simply remove the Kbuild files entirely? Arnd _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH] uapi: use wildcards to list files 2017-01-03 14:35 ` Nicolas Dichtel (?) @ 2017-01-03 21:37 ` Arnd Bergmann -1 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-03 21:37 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-arch, David Howells, linux-nfs, alsa-devel, linux-rdma, netdev, linux-mmc, linux-kernel, dri-devel, linux-spi, linux-raid, netfilter-devel, linux-fbdev, xen-devel, fcoe-devel, linux-mtd, davem, linux-media On Tuesday, January 3, 2017 3:35:44 PM CET Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under include/uapi/ should be exported, so let's > use wildcards. I think the idea makes a lot of sense: if a header is in uapi, we should really export it. However, using a wildcard expression seems a bit backwards here, I think we should make this implicit and not have the Kbuild file at all. The "header-y" syntax was originally added back when the uapi headers were mixed with the internal headers in the same directory. After David Howells introduced the separate directory for uapi, it has become a bit redundant. Can you try to modify scripts/Makefile.headersinst instead so we can simply remove the Kbuild files entirely? Arnd _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH] uapi: use wildcards to list files @ 2017-01-03 21:37 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-03 21:37 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-arch, David Howells, linux-nfs, alsa-devel, linux-rdma, netdev, linux-mmc, linux-kernel, dri-devel, linux-spi, linux-raid, netfilter-devel, linux-fbdev, xen-devel, fcoe-devel, linux-mtd, davem, linux-media On Tuesday, January 3, 2017 3:35:44 PM CET Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under include/uapi/ should be exported, so let's > use wildcards. I think the idea makes a lot of sense: if a header is in uapi, we should really export it. However, using a wildcard expression seems a bit backwards here, I think we should make this implicit and not have the Kbuild file at all. The "header-y" syntax was originally added back when the uapi headers were mixed with the internal headers in the same directory. After David Howells introduced the separate directory for uapi, it has become a bit redundant. Can you try to modify scripts/Makefile.headersinst instead so we can simply remove the Kbuild files entirely? Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH] uapi: use wildcards to list files @ 2017-01-03 21:37 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-03 21:37 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-arch, linux-kernel, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, davem, airlied, David Howells On Tuesday, January 3, 2017 3:35:44 PM CET Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under include/uapi/ should be exported, so let's > use wildcards. I think the idea makes a lot of sense: if a header is in uapi, we should really export it. However, using a wildcard expression seems a bit backwards here, I think we should make this implicit and not have the Kbuild file at all. The "header-y" syntax was originally added back when the uapi headers were mixed with the internal headers in the same directory. After David Howells introduced the separate directory for uapi, it has become a bit redundant. Can you try to modify scripts/Makefile.headersinst instead so we can simply remove the Kbuild files entirely? Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH] uapi: use wildcards to list files 2017-01-03 21:37 ` Arnd Bergmann @ 2017-01-04 9:03 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-04 9:03 UTC (permalink / raw) To: Arnd Bergmann Cc: linux-arch, linux-kernel, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, davem, airlied, David Howells Le 03/01/2017 à 22:37, Arnd Bergmann a écrit : > On Tuesday, January 3, 2017 3:35:44 PM CET Nicolas Dichtel wrote: >> Regularly, when a new header is created in include/uapi/, the developer >> forgets to add it in the corresponding Kbuild file. This error is usually >> detected after the release is out. >> >> In fact, all headers under include/uapi/ should be exported, so let's >> use wildcards. > > I think the idea makes a lot of sense: if a header is in uapi, we should > really export it. However, using a wildcard expression seems a bit > backwards here, I think we should make this implicit and not have the > Kbuild file at all. > > The "header-y" syntax was originally added back when the uapi headers > were mixed with the internal headers in the same directory. After > David Howells introduced the separate directory for uapi, it has > become a bit redundant. Ok, thank you for the explanation, I was wondering why those Kbuild files were needed. > > Can you try to modify scripts/Makefile.headersinst instead so we > can simply remove the Kbuild files entirely? I will try something. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH] uapi: use wildcards to list files @ 2017-01-04 9:03 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-04 9:03 UTC (permalink / raw) To: Arnd Bergmann Cc: linux-arch, linux-kernel, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, davem, airlied, David Howells Le 03/01/2017 à 22:37, Arnd Bergmann a écrit : > On Tuesday, January 3, 2017 3:35:44 PM CET Nicolas Dichtel wrote: >> Regularly, when a new header is created in include/uapi/, the developer >> forgets to add it in the corresponding Kbuild file. This error is usually >> detected after the release is out. >> >> In fact, all headers under include/uapi/ should be exported, so let's >> use wildcards. > > I think the idea makes a lot of sense: if a header is in uapi, we should > really export it. However, using a wildcard expression seems a bit > backwards here, I think we should make this implicit and not have the > Kbuild file at all. > > The "header-y" syntax was originally added back when the uapi headers > were mixed with the internal headers in the same directory. After > David Howells introduced the separate directory for uapi, it has > become a bit redundant. Ok, thank you for the explanation, I was wondering why those Kbuild files were needed. > > Can you try to modify scripts/Makefile.headersinst instead so we > can simply remove the Kbuild files entirely? I will try something. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 0/7] uapi: export all headers under uapi directories 2017-01-04 9:03 ` Nicolas Dichtel ` (4 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch Here is the v2 of this series. The first 5 patches are just cleanup: some exported headers were still under a non-uapi directory. The patch 6 was spotted by code review: there is no in-tree user of this functionality. The last patch remove the use of header-y. Now all files under an uapi directory are exported. asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm only, but there is two exceptions: - cris which exports arch/cris/include/uapi/arch-v[10|32]; - tile which exports arch/tile/include/uapi/arch. Because I don't know if the output of 'make headers_install_all' can be changed, I introduce subdir-y in Kbuild file. The headers_install_all target copies all asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not prefixed (they are put asis in usr/include/). If it's acceptable to modify the output of 'make headers_install_all' to export asm headers in usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports everything under arch/<arch>/include/uapi/. Note also that exported files for asm are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/x86/include/uapi/asm/Kbuild; - arch/x86/include/asm/Kbuild. This complicates a lot the processing (arch/x86/include/asm/Kbuild is also used by scripts/Makefile.asm-generic). This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. I don't know if it should be made against antoher tree. Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: openrisc Here is the v2 of this series. The first 5 patches are just cleanup: some exported headers were still under a non-uapi directory. The patch 6 was spotted by code review: there is no in-tree user of this functionality. The last patch remove the use of header-y. Now all files under an uapi directory are exported. asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm only, but there is two exceptions: - cris which exports arch/cris/include/uapi/arch-v[10|32]; - tile which exports arch/tile/include/uapi/arch. Because I don't know if the output of 'make headers_install_all' can be changed, I introduce subdir-y in Kbuild file. The headers_install_all target copies all asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not prefixed (they are put asis in usr/include/). If it's acceptable to modify the output of 'make headers_install_all' to export asm headers in usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports everything under arch/<arch>/include/uapi/. Note also that exported files for asm are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/x86/include/uapi/asm/Kbuild; - arch/x86/include/asm/Kbuild. This complicates a lot the processing (arch/x86/include/asm/Kbuild is also used by scripts/Makefile.asm-generic). This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. I don't know if it should be made against antoher tree. Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: linux-arm-kernel Here is the v2 of this series. The first 5 patches are just cleanup: some exported headers were still under a non-uapi directory. The patch 6 was spotted by code review: there is no in-tree user of this functionality. The last patch remove the use of header-y. Now all files under an uapi directory are exported. asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm only, but there is two exceptions: - cris which exports arch/cris/include/uapi/arch-v[10|32]; - tile which exports arch/tile/include/uapi/arch. Because I don't know if the output of 'make headers_install_all' can be changed, I introduce subdir-y in Kbuild file. The headers_install_all target copies all asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not prefixed (they are put asis in usr/include/). If it's acceptable to modify the output of 'make headers_install_all' to export asm headers in usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports everything under arch/<arch>/include/uapi/. Note also that exported files for asm are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/x86/include/uapi/asm/Kbuild; - arch/x86/include/asm/Kbuild. This complicates a lot the processing (arch/x86/include/asm/Kbuild is also used by scripts/Makefile.asm-generic). This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. I don't know if it should be made against antoher tree. Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: linux-snps-arc Here is the v2 of this series. The first 5 patches are just cleanup: some exported headers were still under a non-uapi directory. The patch 6 was spotted by code review: there is no in-tree user of this functionality. The last patch remove the use of header-y. Now all files under an uapi directory are exported. asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm only, but there is two exceptions: - cris which exports arch/cris/include/uapi/arch-v[10|32]; - tile which exports arch/tile/include/uapi/arch. Because I don't know if the output of 'make headers_install_all' can be changed, I introduce subdir-y in Kbuild file. The headers_install_all target copies all asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not prefixed (they are put asis in usr/include/). If it's acceptable to modify the output of 'make headers_install_all' to export asm headers in usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports everything under arch/<arch>/include/uapi/. Note also that exported files for asm are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/x86/include/uapi/asm/Kbuild; - arch/x86/include/asm/Kbuild. This complicates a lot the processing (arch/x86/include/asm/Kbuild is also used by scripts/Makefile.asm-generic). This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. I don't know if it should be made against antoher tree. Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem Here is the v2 of this series. The first 5 patches are just cleanup: some exported headers were still under a non-uapi directory. The patch 6 was spotted by code review: there is no in-tree user of this functionality. The last patch remove the use of header-y. Now all files under an uapi directory are exported. asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm only, but there is two exceptions: - cris which exports arch/cris/include/uapi/arch-v[10|32]; - tile which exports arch/tile/include/uapi/arch. Because I don't know if the output of 'make headers_install_all' can be changed, I introduce subdir-y in Kbuild file. The headers_install_all target copies all asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not prefixed (they are put asis in usr/include/). If it's acceptable to modify the output of 'make headers_install_all' to export asm headers in usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports everything under arch/<arch>/include/uapi/. Note also that exported files for asm are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/x86/include/uapi/asm/Kbuild; - arch/x86/include/asm/Kbuild. This complicates a lot the processing (arch/x86/include/asm/Kbuild is also used by scripts/Makefile.asm-generic). This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. I don't know if it should be made against antoher tree. Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem Here is the v2 of this series. The first 5 patches are just cleanup: some exported headers were still under a non-uapi directory. The patch 6 was spotted by code review: there is no in-tree user of this functionality. The last patch remove the use of header-y. Now all files under an uapi directory are exported. asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm only, but there is two exceptions: - cris which exports arch/cris/include/uapi/arch-v[10|32]; - tile which exports arch/tile/include/uapi/arch. Because I don't know if the output of 'make headers_install_all' can be changed, I introduce subdir-y in Kbuild file. The headers_install_all target copies all asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not prefixed (they are put asis in usr/include/). If it's acceptable to modify the output of 'make headers_install_all' to export asm headers in usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports everything under arch/<arch>/include/uapi/. Note also that exported files for asm are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/x86/include/uapi/asm/Kbuild; - arch/x86/include/asm/Kbuild. This complicates a lot the processing (arch/x86/include/asm/Kbuild is also used by scripts/Makefile.asm-generic). This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. I don't know if it should be made against antoher tree. Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch Here is the v2 of this series. The first 5 patches are just cleanup: some exported headers were still under a non-uapi directory. The patch 6 was spotted by code review: there is no in-tree user of this functionality. The last patch remove the use of header-y. Now all files under an uapi directory are exported. asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm only, but there is two exceptions: - cris which exports arch/cris/include/uapi/arch-v[10|32]; - tile which exports arch/tile/include/uapi/arch. Because I don't know if the output of 'make headers_install_all' can be changed, I introduce subdir-y in Kbuild file. The headers_install_all target copies all asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not prefixed (they are put asis in usr/include/). If it's acceptable to modify the output of 'make headers_install_all' to export asm headers in usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports everything under arch/<arch>/include/uapi/. Note also that exported files for asm are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/x86/include/uapi/asm/Kbuild; - arch/x86/include/asm/Kbuild. This complicates a lot the processing (arch/x86/include/asm/Kbuild is also used by scripts/Makefile.asm-generic). This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. I don't know if it should be made against antoher tree. Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 1/7] arm: put types.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (7 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/arm/include/asm/types.h | 36 +---------------------------------- arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 35 deletions(-) create mode 100644 arch/arm/include/uapi/asm/types.h diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h index a53cdb8f068c..c48fee3d7b3b 100644 --- a/arch/arm/include/asm/types.h +++ b/arch/arm/include/asm/types.h @@ -1,40 +1,6 @@ #ifndef _ASM_TYPES_H #define _ASM_TYPES_H -#include <asm-generic/int-ll64.h> - -/* - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as - * unambiguous on ARM as you would expect. For the types below, there is a - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc - * and the kernel itself, which results in build errors if you try to build with - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' - * in order to use NEON intrinsics) - * - * As the typedefs for these types in 'stdint.h' are based on builtin defines - * supplied by GCC, we can tweak these to align with the kernel's idea of those - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same - * source file (provided that -ffreestanding is used). - * - * int32_t uint32_t uintptr_t - * bare metal GCC long unsigned long unsigned int - * glibc GCC int unsigned int unsigned int - * kernel int unsigned int unsigned long - */ - -#ifdef __INT32_TYPE__ -#undef __INT32_TYPE__ -#define __INT32_TYPE__ int -#endif - -#ifdef __UINT32_TYPE__ -#undef __UINT32_TYPE__ -#define __UINT32_TYPE__ unsigned int -#endif - -#ifdef __UINTPTR_TYPE__ -#undef __UINTPTR_TYPE__ -#define __UINTPTR_TYPE__ unsigned long -#endif +#include <uapi/asm/types.h> #endif /* _ASM_TYPES_H */ diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h new file mode 100644 index 000000000000..9435a42f575e --- /dev/null +++ b/arch/arm/include/uapi/asm/types.h @@ -0,0 +1,40 @@ +#ifndef _UAPI_ASM_TYPES_H +#define _UAPI_ASM_TYPES_H + +#include <asm-generic/int-ll64.h> + +/* + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as + * unambiguous on ARM as you would expect. For the types below, there is a + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc + * and the kernel itself, which results in build errors if you try to build with + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' + * in order to use NEON intrinsics) + * + * As the typedefs for these types in 'stdint.h' are based on builtin defines + * supplied by GCC, we can tweak these to align with the kernel's idea of those + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same + * source file (provided that -ffreestanding is used). + * + * int32_t uint32_t uintptr_t + * bare metal GCC long unsigned long unsigned int + * glibc GCC int unsigned int unsigned int + * kernel int unsigned int unsigned long + */ + +#ifdef __INT32_TYPE__ +#undef __INT32_TYPE__ +#define __INT32_TYPE__ int +#endif + +#ifdef __UINT32_TYPE__ +#undef __UINT32_TYPE__ +#define __UINT32_TYPE__ unsigned int +#endif + +#ifdef __UINTPTR_TYPE__ +#undef __UINTPTR_TYPE__ +#define __UINTPTR_TYPE__ unsigned long +#endif + +#endif /* _UAPI_ASM_TYPES_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-me This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/arm/include/asm/types.h | 36 +---------------------------------- arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 35 deletions(-) create mode 100644 arch/arm/include/uapi/asm/types.h diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h index a53cdb8f068c..c48fee3d7b3b 100644 --- a/arch/arm/include/asm/types.h +++ b/arch/arm/include/asm/types.h @@ -1,40 +1,6 @@ #ifndef _ASM_TYPES_H #define _ASM_TYPES_H -#include <asm-generic/int-ll64.h> - -/* - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as - * unambiguous on ARM as you would expect. For the types below, there is a - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc - * and the kernel itself, which results in build errors if you try to build with - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' - * in order to use NEON intrinsics) - * - * As the typedefs for these types in 'stdint.h' are based on builtin defines - * supplied by GCC, we can tweak these to align with the kernel's idea of those - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same - * source file (provided that -ffreestanding is used). - * - * int32_t uint32_t uintptr_t - * bare metal GCC long unsigned long unsigned int - * glibc GCC int unsigned int unsigned int - * kernel int unsigned int unsigned long - */ - -#ifdef __INT32_TYPE__ -#undef __INT32_TYPE__ -#define __INT32_TYPE__ int -#endif - -#ifdef __UINT32_TYPE__ -#undef __UINT32_TYPE__ -#define __UINT32_TYPE__ unsigned int -#endif - -#ifdef __UINTPTR_TYPE__ -#undef __UINTPTR_TYPE__ -#define __UINTPTR_TYPE__ unsigned long -#endif +#include <uapi/asm/types.h> #endif /* _ASM_TYPES_H */ diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h new file mode 100644 index 000000000000..9435a42f575e --- /dev/null +++ b/arch/arm/include/uapi/asm/types.h @@ -0,0 +1,40 @@ +#ifndef _UAPI_ASM_TYPES_H +#define _UAPI_ASM_TYPES_H + +#include <asm-generic/int-ll64.h> + +/* + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as + * unambiguous on ARM as you would expect. For the types below, there is a + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc + * and the kernel itself, which results in build errors if you try to build with + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' + * in order to use NEON intrinsics) + * + * As the typedefs for these types in 'stdint.h' are based on builtin defines + * supplied by GCC, we can tweak these to align with the kernel's idea of those + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same + * source file (provided that -ffreestanding is used). + * + * int32_t uint32_t uintptr_t + * bare metal GCC long unsigned long unsigned int + * glibc GCC int unsigned int unsigned int + * kernel int unsigned int unsigned long + */ + +#ifdef __INT32_TYPE__ +#undef __INT32_TYPE__ +#define __INT32_TYPE__ int +#endif + +#ifdef __UINT32_TYPE__ +#undef __UINT32_TYPE__ +#define __UINT32_TYPE__ unsigned int +#endif + +#ifdef __UINTPTR_TYPE__ +#undef __UINTPTR_TYPE__ +#define __UINTPTR_TYPE__ unsigned long +#endif + +#endif /* _UAPI_ASM_TYPES_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: openrisc This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/arm/include/asm/types.h | 36 +---------------------------------- arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 35 deletions(-) create mode 100644 arch/arm/include/uapi/asm/types.h diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h index a53cdb8f068c..c48fee3d7b3b 100644 --- a/arch/arm/include/asm/types.h +++ b/arch/arm/include/asm/types.h @@ -1,40 +1,6 @@ #ifndef _ASM_TYPES_H #define _ASM_TYPES_H -#include <asm-generic/int-ll64.h> - -/* - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as - * unambiguous on ARM as you would expect. For the types below, there is a - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc - * and the kernel itself, which results in build errors if you try to build with - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' - * in order to use NEON intrinsics) - * - * As the typedefs for these types in 'stdint.h' are based on builtin defines - * supplied by GCC, we can tweak these to align with the kernel's idea of those - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same - * source file (provided that -ffreestanding is used). - * - * int32_t uint32_t uintptr_t - * bare metal GCC long unsigned long unsigned int - * glibc GCC int unsigned int unsigned int - * kernel int unsigned int unsigned long - */ - -#ifdef __INT32_TYPE__ -#undef __INT32_TYPE__ -#define __INT32_TYPE__ int -#endif - -#ifdef __UINT32_TYPE__ -#undef __UINT32_TYPE__ -#define __UINT32_TYPE__ unsigned int -#endif - -#ifdef __UINTPTR_TYPE__ -#undef __UINTPTR_TYPE__ -#define __UINTPTR_TYPE__ unsigned long -#endif +#include <uapi/asm/types.h> #endif /* _ASM_TYPES_H */ diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h new file mode 100644 index 000000000000..9435a42f575e --- /dev/null +++ b/arch/arm/include/uapi/asm/types.h @@ -0,0 +1,40 @@ +#ifndef _UAPI_ASM_TYPES_H +#define _UAPI_ASM_TYPES_H + +#include <asm-generic/int-ll64.h> + +/* + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as + * unambiguous on ARM as you would expect. For the types below, there is a + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc + * and the kernel itself, which results in build errors if you try to build with + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' + * in order to use NEON intrinsics) + * + * As the typedefs for these types in 'stdint.h' are based on builtin defines + * supplied by GCC, we can tweak these to align with the kernel's idea of those + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same + * source file (provided that -ffreestanding is used). + * + * int32_t uint32_t uintptr_t + * bare metal GCC long unsigned long unsigned int + * glibc GCC int unsigned int unsigned int + * kernel int unsigned int unsigned long + */ + +#ifdef __INT32_TYPE__ +#undef __INT32_TYPE__ +#define __INT32_TYPE__ int +#endif + +#ifdef __UINT32_TYPE__ +#undef __UINT32_TYPE__ +#define __UINT32_TYPE__ unsigned int +#endif + +#ifdef __UINTPTR_TYPE__ +#undef __UINTPTR_TYPE__ +#define __UINTPTR_TYPE__ unsigned long +#endif + +#endif /* _UAPI_ASM_TYPES_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: linux-arm-kernel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/arm/include/asm/types.h | 36 +---------------------------------- arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 35 deletions(-) create mode 100644 arch/arm/include/uapi/asm/types.h diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h index a53cdb8f068c..c48fee3d7b3b 100644 --- a/arch/arm/include/asm/types.h +++ b/arch/arm/include/asm/types.h @@ -1,40 +1,6 @@ #ifndef _ASM_TYPES_H #define _ASM_TYPES_H -#include <asm-generic/int-ll64.h> - -/* - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as - * unambiguous on ARM as you would expect. For the types below, there is a - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc - * and the kernel itself, which results in build errors if you try to build with - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' - * in order to use NEON intrinsics) - * - * As the typedefs for these types in 'stdint.h' are based on builtin defines - * supplied by GCC, we can tweak these to align with the kernel's idea of those - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same - * source file (provided that -ffreestanding is used). - * - * int32_t uint32_t uintptr_t - * bare metal GCC long unsigned long unsigned int - * glibc GCC int unsigned int unsigned int - * kernel int unsigned int unsigned long - */ - -#ifdef __INT32_TYPE__ -#undef __INT32_TYPE__ -#define __INT32_TYPE__ int -#endif - -#ifdef __UINT32_TYPE__ -#undef __UINT32_TYPE__ -#define __UINT32_TYPE__ unsigned int -#endif - -#ifdef __UINTPTR_TYPE__ -#undef __UINTPTR_TYPE__ -#define __UINTPTR_TYPE__ unsigned long -#endif +#include <uapi/asm/types.h> #endif /* _ASM_TYPES_H */ diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h new file mode 100644 index 000000000000..9435a42f575e --- /dev/null +++ b/arch/arm/include/uapi/asm/types.h @@ -0,0 +1,40 @@ +#ifndef _UAPI_ASM_TYPES_H +#define _UAPI_ASM_TYPES_H + +#include <asm-generic/int-ll64.h> + +/* + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as + * unambiguous on ARM as you would expect. For the types below, there is a + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc + * and the kernel itself, which results in build errors if you try to build with + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' + * in order to use NEON intrinsics) + * + * As the typedefs for these types in 'stdint.h' are based on builtin defines + * supplied by GCC, we can tweak these to align with the kernel's idea of those + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same + * source file (provided that -ffreestanding is used). + * + * int32_t uint32_t uintptr_t + * bare metal GCC long unsigned long unsigned int + * glibc GCC int unsigned int unsigned int + * kernel int unsigned int unsigned long + */ + +#ifdef __INT32_TYPE__ +#undef __INT32_TYPE__ +#define __INT32_TYPE__ int +#endif + +#ifdef __UINT32_TYPE__ +#undef __UINT32_TYPE__ +#define __UINT32_TYPE__ unsigned int +#endif + +#ifdef __UINTPTR_TYPE__ +#undef __UINTPTR_TYPE__ +#define __UINTPTR_TYPE__ unsigned long +#endif + +#endif /* _UAPI_ASM_TYPES_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: linux-snps-arc This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> --- arch/arm/include/asm/types.h | 36 +---------------------------------- arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 35 deletions(-) create mode 100644 arch/arm/include/uapi/asm/types.h diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h index a53cdb8f068c..c48fee3d7b3b 100644 --- a/arch/arm/include/asm/types.h +++ b/arch/arm/include/asm/types.h @@ -1,40 +1,6 @@ #ifndef _ASM_TYPES_H #define _ASM_TYPES_H -#include <asm-generic/int-ll64.h> - -/* - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as - * unambiguous on ARM as you would expect. For the types below, there is a - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc - * and the kernel itself, which results in build errors if you try to build with - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' - * in order to use NEON intrinsics) - * - * As the typedefs for these types in 'stdint.h' are based on builtin defines - * supplied by GCC, we can tweak these to align with the kernel's idea of those - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same - * source file (provided that -ffreestanding is used). - * - * int32_t uint32_t uintptr_t - * bare metal GCC long unsigned long unsigned int - * glibc GCC int unsigned int unsigned int - * kernel int unsigned int unsigned long - */ - -#ifdef __INT32_TYPE__ -#undef __INT32_TYPE__ -#define __INT32_TYPE__ int -#endif - -#ifdef __UINT32_TYPE__ -#undef __UINT32_TYPE__ -#define __UINT32_TYPE__ unsigned int -#endif - -#ifdef __UINTPTR_TYPE__ -#undef __UINTPTR_TYPE__ -#define __UINTPTR_TYPE__ unsigned long -#endif +#include <uapi/asm/types.h> #endif /* _ASM_TYPES_H */ diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h new file mode 100644 index 000000000000..9435a42f575e --- /dev/null +++ b/arch/arm/include/uapi/asm/types.h @@ -0,0 +1,40 @@ +#ifndef _UAPI_ASM_TYPES_H +#define _UAPI_ASM_TYPES_H + +#include <asm-generic/int-ll64.h> + +/* + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as + * unambiguous on ARM as you would expect. For the types below, there is a + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc + * and the kernel itself, which results in build errors if you try to build with + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' + * in order to use NEON intrinsics) + * + * As the typedefs for these types in 'stdint.h' are based on builtin defines + * supplied by GCC, we can tweak these to align with the kernel's idea of those + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same + * source file (provided that -ffreestanding is used). + * + * int32_t uint32_t uintptr_t + * bare metal GCC long unsigned long unsigned int + * glibc GCC int unsigned int unsigned int + * kernel int unsigned int unsigned long + */ + +#ifdef __INT32_TYPE__ +#undef __INT32_TYPE__ +#define __INT32_TYPE__ int +#endif + +#ifdef __UINT32_TYPE__ +#undef __UINT32_TYPE__ +#define __UINT32_TYPE__ unsigned int +#endif + +#ifdef __UINTPTR_TYPE__ +#undef __UINTPTR_TYPE__ +#define __UINTPTR_TYPE__ unsigned long +#endif + +#endif /* _UAPI_ASM_TYPES_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/arm/include/asm/types.h | 36 +---------------------------------- arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 35 deletions(-) create mode 100644 arch/arm/include/uapi/asm/types.h diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h index a53cdb8f068c..c48fee3d7b3b 100644 --- a/arch/arm/include/asm/types.h +++ b/arch/arm/include/asm/types.h @@ -1,40 +1,6 @@ #ifndef _ASM_TYPES_H #define _ASM_TYPES_H -#include <asm-generic/int-ll64.h> - -/* - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as - * unambiguous on ARM as you would expect. For the types below, there is a - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc - * and the kernel itself, which results in build errors if you try to build with - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' - * in order to use NEON intrinsics) - * - * As the typedefs for these types in 'stdint.h' are based on builtin defines - * supplied by GCC, we can tweak these to align with the kernel's idea of those - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same - * source file (provided that -ffreestanding is used). - * - * int32_t uint32_t uintptr_t - * bare metal GCC long unsigned long unsigned int - * glibc GCC int unsigned int unsigned int - * kernel int unsigned int unsigned long - */ - -#ifdef __INT32_TYPE__ -#undef __INT32_TYPE__ -#define __INT32_TYPE__ int -#endif - -#ifdef __UINT32_TYPE__ -#undef __UINT32_TYPE__ -#define __UINT32_TYPE__ unsigned int -#endif - -#ifdef __UINTPTR_TYPE__ -#undef __UINTPTR_TYPE__ -#define __UINTPTR_TYPE__ unsigned long -#endif +#include <uapi/asm/types.h> #endif /* _ASM_TYPES_H */ diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h new file mode 100644 index 000000000000..9435a42f575e --- /dev/null +++ b/arch/arm/include/uapi/asm/types.h @@ -0,0 +1,40 @@ +#ifndef _UAPI_ASM_TYPES_H +#define _UAPI_ASM_TYPES_H + +#include <asm-generic/int-ll64.h> + +/* + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as + * unambiguous on ARM as you would expect. For the types below, there is a + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc + * and the kernel itself, which results in build errors if you try to build with + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' + * in order to use NEON intrinsics) + * + * As the typedefs for these types in 'stdint.h' are based on builtin defines + * supplied by GCC, we can tweak these to align with the kernel's idea of those + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same + * source file (provided that -ffreestanding is used). + * + * int32_t uint32_t uintptr_t + * bare metal GCC long unsigned long unsigned int + * glibc GCC int unsigned int unsigned int + * kernel int unsigned int unsigned long + */ + +#ifdef __INT32_TYPE__ +#undef __INT32_TYPE__ +#define __INT32_TYPE__ int +#endif + +#ifdef __UINT32_TYPE__ +#undef __UINT32_TYPE__ +#define __UINT32_TYPE__ unsigned int +#endif + +#ifdef __UINTPTR_TYPE__ +#undef __UINTPTR_TYPE__ +#define __UINTPTR_TYPE__ unsigned long +#endif + +#endif /* _UAPI_ASM_TYPES_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-me This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/arm/include/asm/types.h | 36 +---------------------------------- arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 35 deletions(-) create mode 100644 arch/arm/include/uapi/asm/types.h diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h index a53cdb8f068c..c48fee3d7b3b 100644 --- a/arch/arm/include/asm/types.h +++ b/arch/arm/include/asm/types.h @@ -1,40 +1,6 @@ #ifndef _ASM_TYPES_H #define _ASM_TYPES_H -#include <asm-generic/int-ll64.h> - -/* - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as - * unambiguous on ARM as you would expect. For the types below, there is a - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc - * and the kernel itself, which results in build errors if you try to build with - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' - * in order to use NEON intrinsics) - * - * As the typedefs for these types in 'stdint.h' are based on builtin defines - * supplied by GCC, we can tweak these to align with the kernel's idea of those - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same - * source file (provided that -ffreestanding is used). - * - * int32_t uint32_t uintptr_t - * bare metal GCC long unsigned long unsigned int - * glibc GCC int unsigned int unsigned int - * kernel int unsigned int unsigned long - */ - -#ifdef __INT32_TYPE__ -#undef __INT32_TYPE__ -#define __INT32_TYPE__ int -#endif - -#ifdef __UINT32_TYPE__ -#undef __UINT32_TYPE__ -#define __UINT32_TYPE__ unsigned int -#endif - -#ifdef __UINTPTR_TYPE__ -#undef __UINTPTR_TYPE__ -#define __UINTPTR_TYPE__ unsigned long -#endif +#include <uapi/asm/types.h> #endif /* _ASM_TYPES_H */ diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h new file mode 100644 index 000000000000..9435a42f575e --- /dev/null +++ b/arch/arm/include/uapi/asm/types.h @@ -0,0 +1,40 @@ +#ifndef _UAPI_ASM_TYPES_H +#define _UAPI_ASM_TYPES_H + +#include <asm-generic/int-ll64.h> + +/* + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as + * unambiguous on ARM as you would expect. For the types below, there is a + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc + * and the kernel itself, which results in build errors if you try to build with + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' + * in order to use NEON intrinsics) + * + * As the typedefs for these types in 'stdint.h' are based on builtin defines + * supplied by GCC, we can tweak these to align with the kernel's idea of those + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same + * source file (provided that -ffreestanding is used). + * + * int32_t uint32_t uintptr_t + * bare metal GCC long unsigned long unsigned int + * glibc GCC int unsigned int unsigned int + * kernel int unsigned int unsigned long + */ + +#ifdef __INT32_TYPE__ +#undef __INT32_TYPE__ +#define __INT32_TYPE__ int +#endif + +#ifdef __UINT32_TYPE__ +#undef __UINT32_TYPE__ +#define __UINT32_TYPE__ unsigned int +#endif + +#ifdef __UINTPTR_TYPE__ +#undef __UINTPTR_TYPE__ +#define __UINTPTR_TYPE__ unsigned long +#endif + +#endif /* _UAPI_ASM_TYPES_H */ -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/arm/include/asm/types.h | 36 +---------------------------------- arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 35 deletions(-) create mode 100644 arch/arm/include/uapi/asm/types.h diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h index a53cdb8f068c..c48fee3d7b3b 100644 --- a/arch/arm/include/asm/types.h +++ b/arch/arm/include/asm/types.h @@ -1,40 +1,6 @@ #ifndef _ASM_TYPES_H #define _ASM_TYPES_H -#include <asm-generic/int-ll64.h> - -/* - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as - * unambiguous on ARM as you would expect. For the types below, there is a - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc - * and the kernel itself, which results in build errors if you try to build with - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' - * in order to use NEON intrinsics) - * - * As the typedefs for these types in 'stdint.h' are based on builtin defines - * supplied by GCC, we can tweak these to align with the kernel's idea of those - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same - * source file (provided that -ffreestanding is used). - * - * int32_t uint32_t uintptr_t - * bare metal GCC long unsigned long unsigned int - * glibc GCC int unsigned int unsigned int - * kernel int unsigned int unsigned long - */ - -#ifdef __INT32_TYPE__ -#undef __INT32_TYPE__ -#define __INT32_TYPE__ int -#endif - -#ifdef __UINT32_TYPE__ -#undef __UINT32_TYPE__ -#define __UINT32_TYPE__ unsigned int -#endif - -#ifdef __UINTPTR_TYPE__ -#undef __UINTPTR_TYPE__ -#define __UINTPTR_TYPE__ unsigned long -#endif +#include <uapi/asm/types.h> #endif /* _ASM_TYPES_H */ diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h new file mode 100644 index 000000000000..9435a42f575e --- /dev/null +++ b/arch/arm/include/uapi/asm/types.h @@ -0,0 +1,40 @@ +#ifndef _UAPI_ASM_TYPES_H +#define _UAPI_ASM_TYPES_H + +#include <asm-generic/int-ll64.h> + +/* + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as + * unambiguous on ARM as you would expect. For the types below, there is a + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc + * and the kernel itself, which results in build errors if you try to build with + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' + * in order to use NEON intrinsics) + * + * As the typedefs for these types in 'stdint.h' are based on builtin defines + * supplied by GCC, we can tweak these to align with the kernel's idea of those + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same + * source file (provided that -ffreestanding is used). + * + * int32_t uint32_t uintptr_t + * bare metal GCC long unsigned long unsigned int + * glibc GCC int unsigned int unsigned int + * kernel int unsigned int unsigned long + */ + +#ifdef __INT32_TYPE__ +#undef __INT32_TYPE__ +#define __INT32_TYPE__ int +#endif + +#ifdef __UINT32_TYPE__ +#undef __UINT32_TYPE__ +#define __UINT32_TYPE__ unsigned int +#endif + +#ifdef __UINTPTR_TYPE__ +#undef __UINTPTR_TYPE__ +#define __UINTPTR_TYPE__ unsigned long +#endif + +#endif /* _UAPI_ASM_TYPES_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-me VGhpcyBoZWFkZXIgZmlsZSBpcyBleHBvcnRlZCwgdGh1cyBtb3ZlIGl0IHRvIHVhcGkuCgpTaWdu ZWQtb2ZmLWJ5OiBOaWNvbGFzIERpY2h0ZWwgPG5pY29sYXMuZGljaHRlbEA2d2luZC5jb20+Ci0t LQogYXJjaC9hcm0vaW5jbHVkZS9hc20vdHlwZXMuaCAgICAgIHwgMzYgKy0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KIGFyY2gvYXJtL2luY2x1ZGUvdWFwaS9hc20vdHlwZXMuaCB8 IDQwICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMiBmaWxlcyBjaGFu Z2VkLCA0MSBpbnNlcnRpb25zKCspLCAzNSBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0 NCBhcmNoL2FybS9pbmNsdWRlL3VhcGkvYXNtL3R5cGVzLmgKCmRpZmYgLS1naXQgYS9hcmNoL2Fy bS9pbmNsdWRlL2FzbS90eXBlcy5oIGIvYXJjaC9hcm0vaW5jbHVkZS9hc20vdHlwZXMuaAppbmRl eCBhNTNjZGI4ZjA2OGMuLmM0OGZlZTNkN2IzYiAxMDA2NDQKLS0tIGEvYXJjaC9hcm0vaW5jbHVk ZS9hc20vdHlwZXMuaAorKysgYi9hcmNoL2FybS9pbmNsdWRlL2FzbS90eXBlcy5oCkBAIC0xLDQw ICsxLDYgQEAKICNpZm5kZWYgX0FTTV9UWVBFU19ICiAjZGVmaW5lIF9BU01fVFlQRVNfSAogCi0j aW5jbHVkZSA8YXNtLWdlbmVyaWMvaW50LWxsNjQuaD4KLQotLyoKLSAqIFRoZSBDOTkgdHlwZXMg dWludFhYX3QgdGhhdCBhcmUgdXN1YWxseSBkZWZpbmVkIGluICdzdGRpbnQuaCcgYXJlIG5vdCBh cwotICogdW5hbWJpZ3VvdXMgb24gQVJNIGFzIHlvdSB3b3VsZCBleHBlY3QuIEZvciB0aGUgdHlw ZXMgYmVsb3csIHRoZXJlIGlzIGEKLSAqIGRpZmZlcmVuY2Ugb24gQVJNIGJldHdlZW4gR0NDIGJ1 aWx0IGZvciBiYXJlIG1ldGFsIEFSTSwgR0NDIGJ1aWx0IGZvciBnbGliYwotICogYW5kIHRoZSBr ZXJuZWwgaXRzZWxmLCB3aGljaCByZXN1bHRzIGluIGJ1aWxkIGVycm9ycyBpZiB5b3UgdHJ5IHRv IGJ1aWxkIHdpdGgKLSAqIC1mZnJlZXN0YW5kaW5nIGFuZCBpbmNsdWRlICdzdGRpbnQuaCcgKHN1 Y2ggYXMgd2hlbiB5b3UgaW5jbHVkZSAnYXJtX25lb24uaCcKLSAqIGluIG9yZGVyIHRvIHVzZSBO RU9OIGludHJpbnNpY3MpCi0gKgotICogQXMgdGhlIHR5cGVkZWZzIGZvciB0aGVzZSB0eXBlcyBp biAnc3RkaW50LmgnIGFyZSBiYXNlZCBvbiBidWlsdGluIGRlZmluZXMKLSAqIHN1cHBsaWVkIGJ5 IEdDQywgd2UgY2FuIHR3ZWFrIHRoZXNlIHRvIGFsaWduIHdpdGggdGhlIGtlcm5lbCdzIGlkZWEg b2YgdGhvc2UKLSAqIHR5cGVzLCBzbyAnbGludXgvdHlwZXMuaCcgYW5kICdzdGRpbnQuaCcgY2Fu IGJlIHNhZmVseSBpbmNsdWRlZCBmcm9tIHRoZSBzYW1lCi0gKiBzb3VyY2UgZmlsZSAocHJvdmlk ZWQgdGhhdCAtZmZyZWVzdGFuZGluZyBpcyB1c2VkKS4KLSAqCi0gKiAgICAgICAgICAgICAgICAg ICAgaW50MzJfdCAgICAgICAgIHVpbnQzMl90ICAgICAgICAgICAgICAgdWludHB0cl90Ci0gKiBi YXJlIG1ldGFsIEdDQyAgICAgbG9uZyAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgICAgICAgICAg dW5zaWduZWQgaW50Ci0gKiBnbGliYyBHQ0MgICAgICAgICAgaW50ICAgICAgICAgICAgIHVuc2ln bmVkIGludCAgICAgICAgICAgdW5zaWduZWQgaW50Ci0gKiBrZXJuZWwgICAgICAgICAgICAgaW50 ICAgICAgICAgICAgIHVuc2lnbmVkIGludCAgICAgICAgICAgdW5zaWduZWQgbG9uZwotICovCi0K LSNpZmRlZiBfX0lOVDMyX1RZUEVfXwotI3VuZGVmIF9fSU5UMzJfVFlQRV9fCi0jZGVmaW5lIF9f SU5UMzJfVFlQRV9fCQlpbnQKLSNlbmRpZgotCi0jaWZkZWYgX19VSU5UMzJfVFlQRV9fCi0jdW5k ZWYgX19VSU5UMzJfVFlQRV9fCi0jZGVmaW5lIF9fVUlOVDMyX1RZUEVfXwl1bnNpZ25lZCBpbnQK LSNlbmRpZgotCi0jaWZkZWYgX19VSU5UUFRSX1RZUEVfXwotI3VuZGVmIF9fVUlOVFBUUl9UWVBF X18KLSNkZWZpbmUgX19VSU5UUFRSX1RZUEVfXwl1bnNpZ25lZCBsb25nCi0jZW5kaWYKKyNpbmNs dWRlIDx1YXBpL2FzbS90eXBlcy5oPgogCiAjZW5kaWYgLyogX0FTTV9UWVBFU19IICovCmRpZmYg LS1naXQgYS9hcmNoL2FybS9pbmNsdWRlL3VhcGkvYXNtL3R5cGVzLmggYi9hcmNoL2FybS9pbmNs dWRlL3VhcGkvYXNtL3R5cGVzLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwLi45NDM1YTQyZjU3NWUKLS0tIC9kZXYvbnVsbAorKysgYi9hcmNoL2FybS9pbmNsdWRlL3Vh cGkvYXNtL3R5cGVzLmgKQEAgLTAsMCArMSw0MCBAQAorI2lmbmRlZiBfVUFQSV9BU01fVFlQRVNf SAorI2RlZmluZSBfVUFQSV9BU01fVFlQRVNfSAorCisjaW5jbHVkZSA8YXNtLWdlbmVyaWMvaW50 LWxsNjQuaD4KKworLyoKKyAqIFRoZSBDOTkgdHlwZXMgdWludFhYX3QgdGhhdCBhcmUgdXN1YWxs eSBkZWZpbmVkIGluICdzdGRpbnQuaCcgYXJlIG5vdCBhcworICogdW5hbWJpZ3VvdXMgb24gQVJN IGFzIHlvdSB3b3VsZCBleHBlY3QuIEZvciB0aGUgdHlwZXMgYmVsb3csIHRoZXJlIGlzIGEKKyAq IGRpZmZlcmVuY2Ugb24gQVJNIGJldHdlZW4gR0NDIGJ1aWx0IGZvciBiYXJlIG1ldGFsIEFSTSwg R0NDIGJ1aWx0IGZvciBnbGliYworICogYW5kIHRoZSBrZXJuZWwgaXRzZWxmLCB3aGljaCByZXN1 bHRzIGluIGJ1aWxkIGVycm9ycyBpZiB5b3UgdHJ5IHRvIGJ1aWxkIHdpdGgKKyAqIC1mZnJlZXN0 YW5kaW5nIGFuZCBpbmNsdWRlICdzdGRpbnQuaCcgKHN1Y2ggYXMgd2hlbiB5b3UgaW5jbHVkZSAn YXJtX25lb24uaCcKKyAqIGluIG9yZGVyIHRvIHVzZSBORU9OIGludHJpbnNpY3MpCisgKgorICog QXMgdGhlIHR5cGVkZWZzIGZvciB0aGVzZSB0eXBlcyBpbiAnc3RkaW50LmgnIGFyZSBiYXNlZCBv biBidWlsdGluIGRlZmluZXMKKyAqIHN1cHBsaWVkIGJ5IEdDQywgd2UgY2FuIHR3ZWFrIHRoZXNl IHRvIGFsaWduIHdpdGggdGhlIGtlcm5lbCdzIGlkZWEgb2YgdGhvc2UKKyAqIHR5cGVzLCBzbyAn bGludXgvdHlwZXMuaCcgYW5kICdzdGRpbnQuaCcgY2FuIGJlIHNhZmVseSBpbmNsdWRlZCBmcm9t IHRoZSBzYW1lCisgKiBzb3VyY2UgZmlsZSAocHJvdmlkZWQgdGhhdCAtZmZyZWVzdGFuZGluZyBp cyB1c2VkKS4KKyAqCisgKiAgICAgICAgICAgICAgICAgICAgaW50MzJfdCAgICAgICAgIHVpbnQz Ml90ICAgICAgICAgICAgICAgdWludHB0cl90CisgKiBiYXJlIG1ldGFsIEdDQyAgICAgbG9uZyAg ICAgICAgICAgIHVuc2lnbmVkIGxvbmcgICAgICAgICAgdW5zaWduZWQgaW50CisgKiBnbGliYyBH Q0MgICAgICAgICAgaW50ICAgICAgICAgICAgIHVuc2lnbmVkIGludCAgICAgICAgICAgdW5zaWdu ZWQgaW50CisgKiBrZXJuZWwgICAgICAgICAgICAgaW50ICAgICAgICAgICAgIHVuc2lnbmVkIGlu dCAgICAgICAgICAgdW5zaWduZWQgbG9uZworICovCisKKyNpZmRlZiBfX0lOVDMyX1RZUEVfXwor I3VuZGVmIF9fSU5UMzJfVFlQRV9fCisjZGVmaW5lIF9fSU5UMzJfVFlQRV9fCQlpbnQKKyNlbmRp ZgorCisjaWZkZWYgX19VSU5UMzJfVFlQRV9fCisjdW5kZWYgX19VSU5UMzJfVFlQRV9fCisjZGVm aW5lIF9fVUlOVDMyX1RZUEVfXwl1bnNpZ25lZCBpbnQKKyNlbmRpZgorCisjaWZkZWYgX19VSU5U UFRSX1RZUEVfXworI3VuZGVmIF9fVUlOVFBUUl9UWVBFX18KKyNkZWZpbmUgX19VSU5UUFRSX1RZ UEVfXwl1bnNpZ25lZCBsb25nCisjZW5kaWYKKworI2VuZGlmIC8qIF9VQVBJX0FTTV9UWVBFU19I ICovCi0tIAoyLjguMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0 cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo= ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/arm/include/asm/types.h | 36 +---------------------------------- arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 35 deletions(-) create mode 100644 arch/arm/include/uapi/asm/types.h diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h index a53cdb8f068c..c48fee3d7b3b 100644 --- a/arch/arm/include/asm/types.h +++ b/arch/arm/include/asm/types.h @@ -1,40 +1,6 @@ #ifndef _ASM_TYPES_H #define _ASM_TYPES_H -#include <asm-generic/int-ll64.h> - -/* - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as - * unambiguous on ARM as you would expect. For the types below, there is a - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc - * and the kernel itself, which results in build errors if you try to build with - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' - * in order to use NEON intrinsics) - * - * As the typedefs for these types in 'stdint.h' are based on builtin defines - * supplied by GCC, we can tweak these to align with the kernel's idea of those - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same - * source file (provided that -ffreestanding is used). - * - * int32_t uint32_t uintptr_t - * bare metal GCC long unsigned long unsigned int - * glibc GCC int unsigned int unsigned int - * kernel int unsigned int unsigned long - */ - -#ifdef __INT32_TYPE__ -#undef __INT32_TYPE__ -#define __INT32_TYPE__ int -#endif - -#ifdef __UINT32_TYPE__ -#undef __UINT32_TYPE__ -#define __UINT32_TYPE__ unsigned int -#endif - -#ifdef __UINTPTR_TYPE__ -#undef __UINTPTR_TYPE__ -#define __UINTPTR_TYPE__ unsigned long -#endif +#include <uapi/asm/types.h> #endif /* _ASM_TYPES_H */ diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h new file mode 100644 index 000000000000..9435a42f575e --- /dev/null +++ b/arch/arm/include/uapi/asm/types.h @@ -0,0 +1,40 @@ +#ifndef _UAPI_ASM_TYPES_H +#define _UAPI_ASM_TYPES_H + +#include <asm-generic/int-ll64.h> + +/* + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as + * unambiguous on ARM as you would expect. For the types below, there is a + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc + * and the kernel itself, which results in build errors if you try to build with + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' + * in order to use NEON intrinsics) + * + * As the typedefs for these types in 'stdint.h' are based on builtin defines + * supplied by GCC, we can tweak these to align with the kernel's idea of those + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same + * source file (provided that -ffreestanding is used). + * + * int32_t uint32_t uintptr_t + * bare metal GCC long unsigned long unsigned int + * glibc GCC int unsigned int unsigned int + * kernel int unsigned int unsigned long + */ + +#ifdef __INT32_TYPE__ +#undef __INT32_TYPE__ +#define __INT32_TYPE__ int +#endif + +#ifdef __UINT32_TYPE__ +#undef __UINT32_TYPE__ +#define __UINT32_TYPE__ unsigned int +#endif + +#ifdef __UINTPTR_TYPE__ +#undef __UINTPTR_TYPE__ +#define __UINTPTR_TYPE__ unsigned long +#endif + +#endif /* _UAPI_ASM_TYPES_H */ -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v2 1/7] arm: put types.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (8 preceding siblings ...) (?) @ 2017-01-09 11:33 ` Arnd Bergmann -1 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > index a53cdb8f068c..c48fee3d7b3b 100644 > --- a/arch/arm/include/asm/types.h > +++ b/arch/arm/include/asm/types.h > @@ -1,40 +1,6 @@ > #ifndef _ASM_TYPES_H > #define _ASM_TYPES_H > > -#include <asm-generic/int-ll64.h> ... > -#define __UINTPTR_TYPE__ unsigned long > -#endif > +#include <uapi/asm/types.h> > > #endif /* _ASM_TYPES_H */ > Moving the file is correct as far as I can tell, but the extra #include is not necessary here, as the kernel will automatically search both arch/arm/include/ and arch/arm/include/uapi/. The same applies to patches 2 and 4. Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 1/7] arm: put types.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (6 preceding siblings ...) (?) @ 2017-01-09 11:33 ` Arnd Bergmann -1 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-metag, linux-arm-kernel On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > index a53cdb8f068c..c48fee3d7b3b 100644 > --- a/arch/arm/include/asm/types.h > +++ b/arch/arm/include/asm/types.h > @@ -1,40 +1,6 @@ > #ifndef _ASM_TYPES_H > #define _ASM_TYPES_H > > -#include <asm-generic/int-ll64.h> ... > -#define __UINTPTR_TYPE__ unsigned long > -#endif > +#include <uapi/asm/types.h> > > #endif /* _ASM_TYPES_H */ > Moving the file is correct as far as I can tell, but the extra #include is not necessary here, as the kernel will automatically search both arch/arm/include/ and arch/arm/include/uapi/. The same applies to patches 2 and 4. Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: openrisc On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > index a53cdb8f068c..c48fee3d7b3b 100644 > --- a/arch/arm/include/asm/types.h > +++ b/arch/arm/include/asm/types.h > @@ -1,40 +1,6 @@ > #ifndef _ASM_TYPES_H > #define _ASM_TYPES_H > > -#include <asm-generic/int-ll64.h> ... > -#define __UINTPTR_TYPE__ unsigned long > -#endif > +#include <uapi/asm/types.h> > > #endif /* _ASM_TYPES_H */ > Moving the file is correct as far as I can tell, but the extra #include is not necessary here, as the kernel will automatically search both arch/arm/include/ and arch/arm/include/uapi/. The same applies to patches 2 and 4. Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linux-arm-kernel On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > index a53cdb8f068c..c48fee3d7b3b 100644 > --- a/arch/arm/include/asm/types.h > +++ b/arch/arm/include/asm/types.h > @@ -1,40 +1,6 @@ > #ifndef _ASM_TYPES_H > #define _ASM_TYPES_H > > -#include <asm-generic/int-ll64.h> ... > -#define __UINTPTR_TYPE__ unsigned long > -#endif > +#include <uapi/asm/types.h> > > #endif /* _ASM_TYPES_H */ > Moving the file is correct as far as I can tell, but the extra #include is not necessary here, as the kernel will automatically search both arch/arm/include/ and arch/arm/include/uapi/. The same applies to patches 2 and 4. Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linux-snps-arc On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > index a53cdb8f068c..c48fee3d7b3b 100644 > --- a/arch/arm/include/asm/types.h > +++ b/arch/arm/include/asm/types.h > @@ -1,40 +1,6 @@ > #ifndef _ASM_TYPES_H > #define _ASM_TYPES_H > > -#include <asm-generic/int-ll64.h> ... > -#define __UINTPTR_TYPE__ unsigned long > -#endif > +#include <uapi/asm/types.h> > > #endif /* _ASM_TYPES_H */ > Moving the file is correct as far as I can tell, but the extra #include is not necessary here, as the kernel will automatically search both arch/arm/include/ and arch/arm/include/uapi/. The same applies to patches 2 and 4. Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm-kernel, linux-nfs, linux-parisc, linux-cris-kernel, netdev, linux-mmc, linux-kernel, linux-spi, mmarek, netfilter-devel, linux-alpha, nios2-dev, davem On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > index a53cdb8f068c..c48fee3d7b3b 100644 > --- a/arch/arm/include/asm/types.h > +++ b/arch/arm/include/asm/types.h > @@ -1,40 +1,6 @@ > #ifndef _ASM_TYPES_H > #define _ASM_TYPES_H > > -#include <asm-generic/int-ll64.h> ... > -#define __UINTPTR_TYPE__ unsigned long > -#endif > +#include <uapi/asm/types.h> > > #endif /* _ASM_TYPES_H */ > Moving the file is correct as far as I can tell, but the extra #include is not necessary here, as the kernel will automatically search both arch/arm/include/ and arch/arm/include/uapi/. The same applies to patches 2 and 4. Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-metag, linux-arm-kernel, li On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > index a53cdb8f068c..c48fee3d7b3b 100644 > --- a/arch/arm/include/asm/types.h > +++ b/arch/arm/include/asm/types.h > @@ -1,40 +1,6 @@ > #ifndef _ASM_TYPES_H > #define _ASM_TYPES_H > > -#include <asm-generic/int-ll64.h> ... > -#define __UINTPTR_TYPE__ unsigned long > -#endif > +#include <uapi/asm/types.h> > > #endif /* _ASM_TYPES_H */ > Moving the file is correct as far as I can tell, but the extra #include is not necessary here, as the kernel will automatically search both arch/arm/include/ and arch/arm/include/uapi/. The same applies to patches 2 and 4. Arnd _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm-kernel, linux-nfs, linux-parisc, linux-cris-kernel, netdev, linux-mmc, linux-kernel, linux-spi, mmarek, netfilter-devel, linux-alpha, nios2-dev, davem On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > index a53cdb8f068c..c48fee3d7b3b 100644 > --- a/arch/arm/include/asm/types.h > +++ b/arch/arm/include/asm/types.h > @@ -1,40 +1,6 @@ > #ifndef _ASM_TYPES_H > #define _ASM_TYPES_H > > -#include <asm-generic/int-ll64.h> ... > -#define __UINTPTR_TYPE__ unsigned long > -#endif > +#include <uapi/asm/types.h> > > #endif /* _ASM_TYPES_H */ > Moving the file is correct as far as I can tell, but the extra #include is not necessary here, as the kernel will automatically search both arch/arm/include/ and arch/arm/include/uapi/. The same applies to patches 2 and 4. Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-metag, linux-arm-kernel, li T24gRnJpZGF5LCBKYW51YXJ5IDYsIDIwMTcgMTA6NDM6NTMgQU0gQ0VUIE5pY29sYXMgRGljaHRl bCB3cm90ZToKPiAKPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vaW5jbHVkZS9hc20vdHlwZXMuaCBi L2FyY2gvYXJtL2luY2x1ZGUvYXNtL3R5cGVzLmgKPiBpbmRleCBhNTNjZGI4ZjA2OGMuLmM0OGZl ZTNkN2IzYiAxMDA2NDQKPiAtLS0gYS9hcmNoL2FybS9pbmNsdWRlL2FzbS90eXBlcy5oCj4gKysr IGIvYXJjaC9hcm0vaW5jbHVkZS9hc20vdHlwZXMuaAo+IEBAIC0xLDQwICsxLDYgQEAKPiAgI2lm bmRlZiBfQVNNX1RZUEVTX0gKPiAgI2RlZmluZSBfQVNNX1RZUEVTX0gKPiAgCj4gLSNpbmNsdWRl IDxhc20tZ2VuZXJpYy9pbnQtbGw2NC5oPgouLi4KPiAtI2RlZmluZSBfX1VJTlRQVFJfVFlQRV9f ICAgICAgIHVuc2lnbmVkIGxvbmcKPiAtI2VuZGlmCj4gKyNpbmNsdWRlIDx1YXBpL2FzbS90eXBl cy5oPgo+ICAKPiAgI2VuZGlmIC8qIF9BU01fVFlQRVNfSCAqLwo+IAoKTW92aW5nIHRoZSBmaWxl IGlzIGNvcnJlY3QgYXMgZmFyIGFzIEkgY2FuIHRlbGwsIGJ1dCB0aGUgZXh0cmEKI2luY2x1ZGUg aXMgbm90IG5lY2Vzc2FyeSBoZXJlLCBhcyB0aGUga2VybmVsIHdpbGwgYXV0b21hdGljYWxseQpz ZWFyY2ggYm90aCBhcmNoL2FybS9pbmNsdWRlLyBhbmQgYXJjaC9hcm0vaW5jbHVkZS91YXBpLy4K ClRoZSBzYW1lIGFwcGxpZXMgdG8gcGF0Y2hlcyAyIGFuZCA0LgoKCUFybmQKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxp c3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZl bAo= ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-metag, linux-arm-kernel On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > index a53cdb8f068c..c48fee3d7b3b 100644 > --- a/arch/arm/include/asm/types.h > +++ b/arch/arm/include/asm/types.h > @@ -1,40 +1,6 @@ > #ifndef _ASM_TYPES_H > #define _ASM_TYPES_H > > -#include <asm-generic/int-ll64.h> ... > -#define __UINTPTR_TYPE__ unsigned long > -#endif > +#include <uapi/asm/types.h> > > #endif /* _ASM_TYPES_H */ > Moving the file is correct as far as I can tell, but the extra #include is not necessary here, as the kernel will automatically search both arch/arm/include/ and arch/arm/include/uapi/. The same applies to patches 2 and 4. Arnd _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 1/7] arm: put types.h in uapi 2017-01-09 11:33 ` Arnd Bergmann ` (4 preceding siblings ...) (?) @ 2017-01-09 12:00 ` Russell King - ARM Linux -1 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:00 UTC (permalink / raw) To: Arnd Bergmann Cc: linuxppc-dev, linux-kbuild, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k On Mon, Jan 09, 2017 at 12:33:02PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > > index a53cdb8f068c..c48fee3d7b3b 100644 > > --- a/arch/arm/include/asm/types.h > > +++ b/arch/arm/include/asm/types.h > > @@ -1,40 +1,6 @@ > > #ifndef _ASM_TYPES_H > > #define _ASM_TYPES_H > > > > -#include <asm-generic/int-ll64.h> > ... > > -#define __UINTPTR_TYPE__ unsigned long > > -#endif > > +#include <uapi/asm/types.h> > > > > #endif /* _ASM_TYPES_H */ > > > > Moving the file is correct as far as I can tell, but the extra > #include is not necessary here, as the kernel will automatically > search both arch/arm/include/ and arch/arm/include/uapi/. Indeed, I'd like to see the include/asm file gone. -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-09 12:00 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:00 UTC (permalink / raw) To: openrisc On Mon, Jan 09, 2017 at 12:33:02PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > > index a53cdb8f068c..c48fee3d7b3b 100644 > > --- a/arch/arm/include/asm/types.h > > +++ b/arch/arm/include/asm/types.h > > @@ -1,40 +1,6 @@ > > #ifndef _ASM_TYPES_H > > #define _ASM_TYPES_H > > > > -#include <asm-generic/int-ll64.h> > ... > > -#define __UINTPTR_TYPE__ unsigned long > > -#endif > > +#include <uapi/asm/types.h> > > > > #endif /* _ASM_TYPES_H */ > > > > Moving the file is correct as far as I can tell, but the extra > #include is not necessary here, as the kernel will automatically > search both arch/arm/include/ and arch/arm/include/uapi/. Indeed, I'd like to see the include/asm file gone. -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-09 12:00 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:00 UTC (permalink / raw) To: linux-arm-kernel On Mon, Jan 09, 2017 at 12:33:02PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > > index a53cdb8f068c..c48fee3d7b3b 100644 > > --- a/arch/arm/include/asm/types.h > > +++ b/arch/arm/include/asm/types.h > > @@ -1,40 +1,6 @@ > > #ifndef _ASM_TYPES_H > > #define _ASM_TYPES_H > > > > -#include <asm-generic/int-ll64.h> > ... > > -#define __UINTPTR_TYPE__ unsigned long > > -#endif > > +#include <uapi/asm/types.h> > > > > #endif /* _ASM_TYPES_H */ > > > > Moving the file is correct as far as I can tell, but the extra > #include is not necessary here, as the kernel will automatically > search both arch/arm/include/ and arch/arm/include/uapi/. Indeed, I'd like to see the include/asm file gone. -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-09 12:00 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:00 UTC (permalink / raw) To: linux-snps-arc On Mon, Jan 09, 2017@12:33:02PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > > index a53cdb8f068c..c48fee3d7b3b 100644 > > --- a/arch/arm/include/asm/types.h > > +++ b/arch/arm/include/asm/types.h > > @@ -1,40 +1,6 @@ > > #ifndef _ASM_TYPES_H > > #define _ASM_TYPES_H > > > > -#include <asm-generic/int-ll64.h> > ... > > -#define __UINTPTR_TYPE__ unsigned long > > -#endif > > +#include <uapi/asm/types.h> > > > > #endif /* _ASM_TYPES_H */ > > > > Moving the file is correct as far as I can tell, but the extra > #include is not necessary here, as the kernel will automatically > search both arch/arm/include/ and arch/arm/include/uapi/. Indeed, I'd like to see the include/asm file gone. -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-09 12:00 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:00 UTC (permalink / raw) To: Arnd Bergmann Cc: linuxppc-dev, linux-kbuild, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-metag, linux-arm-kernel, linux-nfs, linux-cris-kernel, linux-parisc, netdev, linux-mmc, linux-kernel, linux-spi, mmarek, netfilter-devel, linux-alpha, nios2-dev, davem On Mon, Jan 09, 2017 at 12:33:02PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > > index a53cdb8f068c..c48fee3d7b3b 100644 > > --- a/arch/arm/include/asm/types.h > > +++ b/arch/arm/include/asm/types.h > > @@ -1,40 +1,6 @@ > > #ifndef _ASM_TYPES_H > > #define _ASM_TYPES_H > > > > -#include <asm-generic/int-ll64.h> > ... > > -#define __UINTPTR_TYPE__ unsigned long > > -#endif > > +#include <uapi/asm/types.h> > > > > #endif /* _ASM_TYPES_H */ > > > > Moving the file is correct as far as I can tell, but the extra > #include is not necessary here, as the kernel will automatically > search both arch/arm/include/ and arch/arm/include/uapi/. Indeed, I'd like to see the include/asm file gone. -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-09 12:00 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:00 UTC (permalink / raw) To: Arnd Bergmann Cc: linuxppc-dev, linux-kbuild, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-metag, linux-arm-kernel, linux-nfs, linux-cris-kernel, linux-parisc, netdev, linux-mmc, linux-kernel, linux-spi, mmarek, netfilter-devel, linux-alpha, nios2-dev, davem On Mon, Jan 09, 2017 at 12:33:02PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > > index a53cdb8f068c..c48fee3d7b3b 100644 > > --- a/arch/arm/include/asm/types.h > > +++ b/arch/arm/include/asm/types.h > > @@ -1,40 +1,6 @@ > > #ifndef _ASM_TYPES_H > > #define _ASM_TYPES_H > > > > -#include <asm-generic/int-ll64.h> > ... > > -#define __UINTPTR_TYPE__ unsigned long > > -#endif > > +#include <uapi/asm/types.h> > > > > #endif /* _ASM_TYPES_H */ > > > > Moving the file is correct as far as I can tell, but the extra > #include is not necessary here, as the kernel will automatically > search both arch/arm/include/ and arch/arm/include/uapi/. Indeed, I'd like to see the include/asm file gone. -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 1/7] arm: put types.h in uapi @ 2017-01-09 12:00 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:00 UTC (permalink / raw) To: Arnd Bergmann Cc: linuxppc-dev, linux-kbuild, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k On Mon, Jan 09, 2017 at 12:33:02PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > > index a53cdb8f068c..c48fee3d7b3b 100644 > > --- a/arch/arm/include/asm/types.h > > +++ b/arch/arm/include/asm/types.h > > @@ -1,40 +1,6 @@ > > #ifndef _ASM_TYPES_H > > #define _ASM_TYPES_H > > > > -#include <asm-generic/int-ll64.h> > ... > > -#define __UINTPTR_TYPE__ unsigned long > > -#endif > > +#include <uapi/asm/types.h> > > > > #endif /* _ASM_TYPES_H */ > > > > Moving the file is correct as far as I can tell, but the extra > #include is not necessary here, as the kernel will automatically > search both arch/arm/include/ and arch/arm/include/uapi/. Indeed, I'd like to see the include/asm file gone. -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 1/7] arm: put types.h in uapi 2017-01-09 11:33 ` Arnd Bergmann ` (8 preceding siblings ...) (?) @ 2017-01-09 12:00 ` Russell King - ARM Linux -1 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:00 UTC (permalink / raw) To: Arnd Bergmann Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-metag, linux-arm- On Mon, Jan 09, 2017 at 12:33:02PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > > index a53cdb8f068c..c48fee3d7b3b 100644 > > --- a/arch/arm/include/asm/types.h > > +++ b/arch/arm/include/asm/types.h > > @@ -1,40 +1,6 @@ > > #ifndef _ASM_TYPES_H > > #define _ASM_TYPES_H > > > > -#include <asm-generic/int-ll64.h> > ... > > -#define __UINTPTR_TYPE__ unsigned long > > -#endif > > +#include <uapi/asm/types.h> > > > > #endif /* _ASM_TYPES_H */ > > > > Moving the file is correct as far as I can tell, but the extra > #include is not necessary here, as the kernel will automatically > search both arch/arm/include/ and arch/arm/include/uapi/. Indeed, I'd like to see the include/asm file gone. -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 1/7] arm: put types.h in uapi 2017-01-09 11:33 ` Arnd Bergmann ` (9 preceding siblings ...) (?) @ 2017-01-09 12:00 ` Russell King - ARM Linux -1 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:00 UTC (permalink / raw) To: Arnd Bergmann Cc: linuxppc-dev, linux-kbuild, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k On Mon, Jan 09, 2017 at 12:33:02PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:53 AM CET Nicolas Dichtel wrote: > > > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > > index a53cdb8f068c..c48fee3d7b3b 100644 > > --- a/arch/arm/include/asm/types.h > > +++ b/arch/arm/include/asm/types.h > > @@ -1,40 +1,6 @@ > > #ifndef _ASM_TYPES_H > > #define _ASM_TYPES_H > > > > -#include <asm-generic/int-ll64.h> > ... > > -#define __UINTPTR_TYPE__ unsigned long > > -#endif > > +#include <uapi/asm/types.h> > > > > #endif /* _ASM_TYPES_H */ > > > > Moving the file is correct as far as I can tell, but the extra > #include is not necessary here, as the kernel will automatically > search both arch/arm/include/ and arch/arm/include/uapi/. Indeed, I'd like to see the include/asm file gone. -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 1/7] arm: put types.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (6 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/arm/include/asm/types.h | 36 +---------------------------------- arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 35 deletions(-) create mode 100644 arch/arm/include/uapi/asm/types.h diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h index a53cdb8f068c..c48fee3d7b3b 100644 --- a/arch/arm/include/asm/types.h +++ b/arch/arm/include/asm/types.h @@ -1,40 +1,6 @@ #ifndef _ASM_TYPES_H #define _ASM_TYPES_H -#include <asm-generic/int-ll64.h> - -/* - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as - * unambiguous on ARM as you would expect. For the types below, there is a - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc - * and the kernel itself, which results in build errors if you try to build with - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' - * in order to use NEON intrinsics) - * - * As the typedefs for these types in 'stdint.h' are based on builtin defines - * supplied by GCC, we can tweak these to align with the kernel's idea of those - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same - * source file (provided that -ffreestanding is used). - * - * int32_t uint32_t uintptr_t - * bare metal GCC long unsigned long unsigned int - * glibc GCC int unsigned int unsigned int - * kernel int unsigned int unsigned long - */ - -#ifdef __INT32_TYPE__ -#undef __INT32_TYPE__ -#define __INT32_TYPE__ int -#endif - -#ifdef __UINT32_TYPE__ -#undef __UINT32_TYPE__ -#define __UINT32_TYPE__ unsigned int -#endif - -#ifdef __UINTPTR_TYPE__ -#undef __UINTPTR_TYPE__ -#define __UINTPTR_TYPE__ unsigned long -#endif +#include <uapi/asm/types.h> #endif /* _ASM_TYPES_H */ diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h new file mode 100644 index 000000000000..9435a42f575e --- /dev/null +++ b/arch/arm/include/uapi/asm/types.h @@ -0,0 +1,40 @@ +#ifndef _UAPI_ASM_TYPES_H +#define _UAPI_ASM_TYPES_H + +#include <asm-generic/int-ll64.h> + +/* + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as + * unambiguous on ARM as you would expect. For the types below, there is a + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc + * and the kernel itself, which results in build errors if you try to build with + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' + * in order to use NEON intrinsics) + * + * As the typedefs for these types in 'stdint.h' are based on builtin defines + * supplied by GCC, we can tweak these to align with the kernel's idea of those + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same + * source file (provided that -ffreestanding is used). + * + * int32_t uint32_t uintptr_t + * bare metal GCC long unsigned long unsigned int + * glibc GCC int unsigned int unsigned int + * kernel int unsigned int unsigned long + */ + +#ifdef __INT32_TYPE__ +#undef __INT32_TYPE__ +#define __INT32_TYPE__ int +#endif + +#ifdef __UINT32_TYPE__ +#undef __UINT32_TYPE__ +#define __UINT32_TYPE__ unsigned int +#endif + +#ifdef __UINTPTR_TYPE__ +#undef __UINTPTR_TYPE__ +#define __UINTPTR_TYPE__ unsigned long +#endif + +#endif /* _UAPI_ASM_TYPES_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 2/7] h8300: put bitsperlong.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (7 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 10 +--------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h index e140e46729ac..c0a8e2ee531e 100644 --- a/arch/h8300/include/asm/bitsperlong.h +++ b/arch/h8300/include/asm/bitsperlong.h @@ -1,14 +1,6 @@ #ifndef __ASM_H8300_BITS_PER_LONG #define __ASM_H8300_BITS_PER_LONG -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif +#include <uapi/asm/bitsperlong.h> #endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 2/7] h8300: put bitsperlong.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-me This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 10 +--------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h index e140e46729ac..c0a8e2ee531e 100644 --- a/arch/h8300/include/asm/bitsperlong.h +++ b/arch/h8300/include/asm/bitsperlong.h @@ -1,14 +1,6 @@ #ifndef __ASM_H8300_BITS_PER_LONG #define __ASM_H8300_BITS_PER_LONG -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif +#include <uapi/asm/bitsperlong.h> #endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 2/7] h8300: put bitsperlong.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: openrisc This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 10 +--------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h index e140e46729ac..c0a8e2ee531e 100644 --- a/arch/h8300/include/asm/bitsperlong.h +++ b/arch/h8300/include/asm/bitsperlong.h @@ -1,14 +1,6 @@ #ifndef __ASM_H8300_BITS_PER_LONG #define __ASM_H8300_BITS_PER_LONG -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif +#include <uapi/asm/bitsperlong.h> #endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 2/7] h8300: put bitsperlong.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: linux-arm-kernel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 10 +--------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h index e140e46729ac..c0a8e2ee531e 100644 --- a/arch/h8300/include/asm/bitsperlong.h +++ b/arch/h8300/include/asm/bitsperlong.h @@ -1,14 +1,6 @@ #ifndef __ASM_H8300_BITS_PER_LONG #define __ASM_H8300_BITS_PER_LONG -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif +#include <uapi/asm/bitsperlong.h> #endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 2/7] h8300: put bitsperlong.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: linux-snps-arc This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 10 +--------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h index e140e46729ac..c0a8e2ee531e 100644 --- a/arch/h8300/include/asm/bitsperlong.h +++ b/arch/h8300/include/asm/bitsperlong.h @@ -1,14 +1,6 @@ #ifndef __ASM_H8300_BITS_PER_LONG #define __ASM_H8300_BITS_PER_LONG -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif +#include <uapi/asm/bitsperlong.h> #endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 2/7] h8300: put bitsperlong.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 10 +--------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h index e140e46729ac..c0a8e2ee531e 100644 --- a/arch/h8300/include/asm/bitsperlong.h +++ b/arch/h8300/include/asm/bitsperlong.h @@ -1,14 +1,6 @@ #ifndef __ASM_H8300_BITS_PER_LONG #define __ASM_H8300_BITS_PER_LONG -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif +#include <uapi/asm/bitsperlong.h> #endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 2/7] h8300: put bitsperlong.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-me This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 10 +--------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h index e140e46729ac..c0a8e2ee531e 100644 --- a/arch/h8300/include/asm/bitsperlong.h +++ b/arch/h8300/include/asm/bitsperlong.h @@ -1,14 +1,6 @@ #ifndef __ASM_H8300_BITS_PER_LONG #define __ASM_H8300_BITS_PER_LONG -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif +#include <uapi/asm/bitsperlong.h> #endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 2/7] h8300: put bitsperlong.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 10 +--------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h index e140e46729ac..c0a8e2ee531e 100644 --- a/arch/h8300/include/asm/bitsperlong.h +++ b/arch/h8300/include/asm/bitsperlong.h @@ -1,14 +1,6 @@ #ifndef __ASM_H8300_BITS_PER_LONG #define __ASM_H8300_BITS_PER_LONG -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif +#include <uapi/asm/bitsperlong.h> #endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 2/7] h8300: put bitsperlong.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-me VGhpcyBoZWFkZXIgZmlsZSBpcyBleHBvcnRlZCwgdGh1cyBtb3ZlIGl0IHRvIHVhcGkuCgpTaWdu ZWQtb2ZmLWJ5OiBOaWNvbGFzIERpY2h0ZWwgPG5pY29sYXMuZGljaHRlbEA2d2luZC5jb20+Ci0t LQogYXJjaC9oODMwMC9pbmNsdWRlL2FzbS9iaXRzcGVybG9uZy5oICAgICAgfCAxMCArLS0tLS0t LS0tCiBhcmNoL2g4MzAwL2luY2x1ZGUvdWFwaS9hc20vYml0c3BlcmxvbmcuaCB8IDE0ICsrKysr KysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25z KC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgYXJjaC9oODMwMC9pbmNsdWRlL3VhcGkvYXNtL2JpdHNw ZXJsb25nLmgKCmRpZmYgLS1naXQgYS9hcmNoL2g4MzAwL2luY2x1ZGUvYXNtL2JpdHNwZXJsb25n LmggYi9hcmNoL2g4MzAwL2luY2x1ZGUvYXNtL2JpdHNwZXJsb25nLmgKaW5kZXggZTE0MGU0Njcy OWFjLi5jMGE4ZTJlZTUzMWUgMTAwNjQ0Ci0tLSBhL2FyY2gvaDgzMDAvaW5jbHVkZS9hc20vYml0 c3BlcmxvbmcuaAorKysgYi9hcmNoL2g4MzAwL2luY2x1ZGUvYXNtL2JpdHNwZXJsb25nLmgKQEAg LTEsMTQgKzEsNiBAQAogI2lmbmRlZiBfX0FTTV9IODMwMF9CSVRTX1BFUl9MT05HCiAjZGVmaW5l IF9fQVNNX0g4MzAwX0JJVFNfUEVSX0xPTkcKIAotI2luY2x1ZGUgPGFzbS1nZW5lcmljL2JpdHNw ZXJsb25nLmg+Ci0KLSNpZiAhZGVmaW5lZChfX0FTU0VNQkxZX18pCi0vKiBoODMwMC11bmtub3du LWxpbnV4IHJlcXVpcmVkIGxvbmcgKi8KLSNkZWZpbmUgX19rZXJuZWxfc2l6ZV90IF9fa2VybmVs X3NpemVfdAotdHlwZWRlZiB1bnNpZ25lZCBsb25nCV9fa2VybmVsX3NpemVfdDsKLXR5cGVkZWYg bG9uZwkJX19rZXJuZWxfc3NpemVfdDsKLXR5cGVkZWYgbG9uZwkJX19rZXJuZWxfcHRyZGlmZl90 OwotI2VuZGlmCisjaW5jbHVkZSA8dWFwaS9hc20vYml0c3BlcmxvbmcuaD4KIAogI2VuZGlmIC8q IF9fQVNNX0g4MzAwX0JJVFNfUEVSX0xPTkcgKi8KZGlmZiAtLWdpdCBhL2FyY2gvaDgzMDAvaW5j bHVkZS91YXBpL2FzbS9iaXRzcGVybG9uZy5oIGIvYXJjaC9oODMwMC9pbmNsdWRlL3VhcGkvYXNt L2JpdHNwZXJsb25nLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi5l NTZjZjcyMzY5YjYKLS0tIC9kZXYvbnVsbAorKysgYi9hcmNoL2g4MzAwL2luY2x1ZGUvdWFwaS9h c20vYml0c3BlcmxvbmcuaApAQCAtMCwwICsxLDE0IEBACisjaWZuZGVmIF9VQVBJX0FTTV9IODMw MF9CSVRTX1BFUl9MT05HCisjZGVmaW5lIF9VQVBJX0FTTV9IODMwMF9CSVRTX1BFUl9MT05HCisK KyNpbmNsdWRlIDxhc20tZ2VuZXJpYy9iaXRzcGVybG9uZy5oPgorCisjaWYgIWRlZmluZWQoX19B U1NFTUJMWV9fKQorLyogaDgzMDAtdW5rbm93bi1saW51eCByZXF1aXJlZCBsb25nICovCisjZGVm aW5lIF9fa2VybmVsX3NpemVfdCBfX2tlcm5lbF9zaXplX3QKK3R5cGVkZWYgdW5zaWduZWQgbG9u ZwlfX2tlcm5lbF9zaXplX3Q7Cit0eXBlZGVmIGxvbmcJCV9fa2VybmVsX3NzaXplX3Q7Cit0eXBl ZGVmIGxvbmcJCV9fa2VybmVsX3B0cmRpZmZfdDsKKyNlbmRpZgorCisjZW5kaWYgLyogX1VBUElf QVNNX0g4MzAwX0JJVFNfUEVSX0xPTkcgKi8KLS0gCjIuOC4xCgoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4t ZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg== ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 2/7] h8300: put bitsperlong.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 10 +--------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h index e140e46729ac..c0a8e2ee531e 100644 --- a/arch/h8300/include/asm/bitsperlong.h +++ b/arch/h8300/include/asm/bitsperlong.h @@ -1,14 +1,6 @@ #ifndef __ASM_H8300_BITS_PER_LONG #define __ASM_H8300_BITS_PER_LONG -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif +#include <uapi/asm/bitsperlong.h> #endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 2/7] h8300: put bitsperlong.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (8 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 10 +--------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h index e140e46729ac..c0a8e2ee531e 100644 --- a/arch/h8300/include/asm/bitsperlong.h +++ b/arch/h8300/include/asm/bitsperlong.h @@ -1,14 +1,6 @@ #ifndef __ASM_H8300_BITS_PER_LONG #define __ASM_H8300_BITS_PER_LONG -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif +#include <uapi/asm/bitsperlong.h> #endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 3/7] nios2: put setup.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (9 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/nios2/include/asm/setup.h | 2 +- arch/nios2/include/uapi/asm/setup.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 arch/nios2/include/uapi/asm/setup.h diff --git a/arch/nios2/include/asm/setup.h b/arch/nios2/include/asm/setup.h index dcbf8cf1a344..d49e9e91bf55 100644 --- a/arch/nios2/include/asm/setup.h +++ b/arch/nios2/include/asm/setup.h @@ -19,7 +19,7 @@ #ifndef _ASM_NIOS2_SETUP_H #define _ASM_NIOS2_SETUP_H -#include <asm-generic/setup.h> +#include <uapi/asm/setup.h> #ifndef __ASSEMBLY__ #ifdef __KERNEL__ diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h new file mode 100644 index 000000000000..8d8285997ba8 --- /dev/null +++ b/arch/nios2/include/uapi/asm/setup.h @@ -0,0 +1,6 @@ +#ifndef _UAPI_ASM_NIOS2_SETUP_H +#define _UAPI_ASM_NIOS2_SETUP_H + +#include <asm-generic/setup.h> + +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 3/7] nios2: put setup.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (6 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/nios2/include/asm/setup.h | 2 +- arch/nios2/include/uapi/asm/setup.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 arch/nios2/include/uapi/asm/setup.h diff --git a/arch/nios2/include/asm/setup.h b/arch/nios2/include/asm/setup.h index dcbf8cf1a344..d49e9e91bf55 100644 --- a/arch/nios2/include/asm/setup.h +++ b/arch/nios2/include/asm/setup.h @@ -19,7 +19,7 @@ #ifndef _ASM_NIOS2_SETUP_H #define _ASM_NIOS2_SETUP_H -#include <asm-generic/setup.h> +#include <uapi/asm/setup.h> #ifndef __ASSEMBLY__ #ifdef __KERNEL__ diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h new file mode 100644 index 000000000000..8d8285997ba8 --- /dev/null +++ b/arch/nios2/include/uapi/asm/setup.h @@ -0,0 +1,6 @@ +#ifndef _UAPI_ASM_NIOS2_SETUP_H +#define _UAPI_ASM_NIOS2_SETUP_H + +#include <asm-generic/setup.h> + +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 3/7] nios2: put setup.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-me This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/nios2/include/asm/setup.h | 2 +- arch/nios2/include/uapi/asm/setup.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 arch/nios2/include/uapi/asm/setup.h diff --git a/arch/nios2/include/asm/setup.h b/arch/nios2/include/asm/setup.h index dcbf8cf1a344..d49e9e91bf55 100644 --- a/arch/nios2/include/asm/setup.h +++ b/arch/nios2/include/asm/setup.h @@ -19,7 +19,7 @@ #ifndef _ASM_NIOS2_SETUP_H #define _ASM_NIOS2_SETUP_H -#include <asm-generic/setup.h> +#include <uapi/asm/setup.h> #ifndef __ASSEMBLY__ #ifdef __KERNEL__ diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h new file mode 100644 index 000000000000..8d8285997ba8 --- /dev/null +++ b/arch/nios2/include/uapi/asm/setup.h @@ -0,0 +1,6 @@ +#ifndef _UAPI_ASM_NIOS2_SETUP_H +#define _UAPI_ASM_NIOS2_SETUP_H + +#include <asm-generic/setup.h> + +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 3/7] nios2: put setup.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: openrisc This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/nios2/include/asm/setup.h | 2 +- arch/nios2/include/uapi/asm/setup.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 arch/nios2/include/uapi/asm/setup.h diff --git a/arch/nios2/include/asm/setup.h b/arch/nios2/include/asm/setup.h index dcbf8cf1a344..d49e9e91bf55 100644 --- a/arch/nios2/include/asm/setup.h +++ b/arch/nios2/include/asm/setup.h @@ -19,7 +19,7 @@ #ifndef _ASM_NIOS2_SETUP_H #define _ASM_NIOS2_SETUP_H -#include <asm-generic/setup.h> +#include <uapi/asm/setup.h> #ifndef __ASSEMBLY__ #ifdef __KERNEL__ diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h new file mode 100644 index 000000000000..8d8285997ba8 --- /dev/null +++ b/arch/nios2/include/uapi/asm/setup.h @@ -0,0 +1,6 @@ +#ifndef _UAPI_ASM_NIOS2_SETUP_H +#define _UAPI_ASM_NIOS2_SETUP_H + +#include <asm-generic/setup.h> + +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 3/7] nios2: put setup.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: linux-arm-kernel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/nios2/include/asm/setup.h | 2 +- arch/nios2/include/uapi/asm/setup.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 arch/nios2/include/uapi/asm/setup.h diff --git a/arch/nios2/include/asm/setup.h b/arch/nios2/include/asm/setup.h index dcbf8cf1a344..d49e9e91bf55 100644 --- a/arch/nios2/include/asm/setup.h +++ b/arch/nios2/include/asm/setup.h @@ -19,7 +19,7 @@ #ifndef _ASM_NIOS2_SETUP_H #define _ASM_NIOS2_SETUP_H -#include <asm-generic/setup.h> +#include <uapi/asm/setup.h> #ifndef __ASSEMBLY__ #ifdef __KERNEL__ diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h new file mode 100644 index 000000000000..8d8285997ba8 --- /dev/null +++ b/arch/nios2/include/uapi/asm/setup.h @@ -0,0 +1,6 @@ +#ifndef _UAPI_ASM_NIOS2_SETUP_H +#define _UAPI_ASM_NIOS2_SETUP_H + +#include <asm-generic/setup.h> + +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 3/7] nios2: put setup.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: linux-snps-arc This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> --- arch/nios2/include/asm/setup.h | 2 +- arch/nios2/include/uapi/asm/setup.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 arch/nios2/include/uapi/asm/setup.h diff --git a/arch/nios2/include/asm/setup.h b/arch/nios2/include/asm/setup.h index dcbf8cf1a344..d49e9e91bf55 100644 --- a/arch/nios2/include/asm/setup.h +++ b/arch/nios2/include/asm/setup.h @@ -19,7 +19,7 @@ #ifndef _ASM_NIOS2_SETUP_H #define _ASM_NIOS2_SETUP_H -#include <asm-generic/setup.h> +#include <uapi/asm/setup.h> #ifndef __ASSEMBLY__ #ifdef __KERNEL__ diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h new file mode 100644 index 000000000000..8d8285997ba8 --- /dev/null +++ b/arch/nios2/include/uapi/asm/setup.h @@ -0,0 +1,6 @@ +#ifndef _UAPI_ASM_NIOS2_SETUP_H +#define _UAPI_ASM_NIOS2_SETUP_H + +#include <asm-generic/setup.h> + +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 3/7] nios2: put setup.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/nios2/include/asm/setup.h | 2 +- arch/nios2/include/uapi/asm/setup.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 arch/nios2/include/uapi/asm/setup.h diff --git a/arch/nios2/include/asm/setup.h b/arch/nios2/include/asm/setup.h index dcbf8cf1a344..d49e9e91bf55 100644 --- a/arch/nios2/include/asm/setup.h +++ b/arch/nios2/include/asm/setup.h @@ -19,7 +19,7 @@ #ifndef _ASM_NIOS2_SETUP_H #define _ASM_NIOS2_SETUP_H -#include <asm-generic/setup.h> +#include <uapi/asm/setup.h> #ifndef __ASSEMBLY__ #ifdef __KERNEL__ diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h new file mode 100644 index 000000000000..8d8285997ba8 --- /dev/null +++ b/arch/nios2/include/uapi/asm/setup.h @@ -0,0 +1,6 @@ +#ifndef _UAPI_ASM_NIOS2_SETUP_H +#define _UAPI_ASM_NIOS2_SETUP_H + +#include <asm-generic/setup.h> + +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 3/7] nios2: put setup.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/nios2/include/asm/setup.h | 2 +- arch/nios2/include/uapi/asm/setup.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 arch/nios2/include/uapi/asm/setup.h diff --git a/arch/nios2/include/asm/setup.h b/arch/nios2/include/asm/setup.h index dcbf8cf1a344..d49e9e91bf55 100644 --- a/arch/nios2/include/asm/setup.h +++ b/arch/nios2/include/asm/setup.h @@ -19,7 +19,7 @@ #ifndef _ASM_NIOS2_SETUP_H #define _ASM_NIOS2_SETUP_H -#include <asm-generic/setup.h> +#include <uapi/asm/setup.h> #ifndef __ASSEMBLY__ #ifdef __KERNEL__ diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h new file mode 100644 index 000000000000..8d8285997ba8 --- /dev/null +++ b/arch/nios2/include/uapi/asm/setup.h @@ -0,0 +1,6 @@ +#ifndef _UAPI_ASM_NIOS2_SETUP_H +#define _UAPI_ASM_NIOS2_SETUP_H + +#include <asm-generic/setup.h> + +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 3/7] nios2: put setup.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-me This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/nios2/include/asm/setup.h | 2 +- arch/nios2/include/uapi/asm/setup.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 arch/nios2/include/uapi/asm/setup.h diff --git a/arch/nios2/include/asm/setup.h b/arch/nios2/include/asm/setup.h index dcbf8cf1a344..d49e9e91bf55 100644 --- a/arch/nios2/include/asm/setup.h +++ b/arch/nios2/include/asm/setup.h @@ -19,7 +19,7 @@ #ifndef _ASM_NIOS2_SETUP_H #define _ASM_NIOS2_SETUP_H -#include <asm-generic/setup.h> +#include <uapi/asm/setup.h> #ifndef __ASSEMBLY__ #ifdef __KERNEL__ diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h new file mode 100644 index 000000000000..8d8285997ba8 --- /dev/null +++ b/arch/nios2/include/uapi/asm/setup.h @@ -0,0 +1,6 @@ +#ifndef _UAPI_ASM_NIOS2_SETUP_H +#define _UAPI_ASM_NIOS2_SETUP_H + +#include <asm-generic/setup.h> + +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 3/7] nios2: put setup.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/nios2/include/asm/setup.h | 2 +- arch/nios2/include/uapi/asm/setup.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 arch/nios2/include/uapi/asm/setup.h diff --git a/arch/nios2/include/asm/setup.h b/arch/nios2/include/asm/setup.h index dcbf8cf1a344..d49e9e91bf55 100644 --- a/arch/nios2/include/asm/setup.h +++ b/arch/nios2/include/asm/setup.h @@ -19,7 +19,7 @@ #ifndef _ASM_NIOS2_SETUP_H #define _ASM_NIOS2_SETUP_H -#include <asm-generic/setup.h> +#include <uapi/asm/setup.h> #ifndef __ASSEMBLY__ #ifdef __KERNEL__ diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h new file mode 100644 index 000000000000..8d8285997ba8 --- /dev/null +++ b/arch/nios2/include/uapi/asm/setup.h @@ -0,0 +1,6 @@ +#ifndef _UAPI_ASM_NIOS2_SETUP_H +#define _UAPI_ASM_NIOS2_SETUP_H + +#include <asm-generic/setup.h> + +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v2 3/7] nios2: put setup.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (7 preceding siblings ...) (?) @ 2017-01-09 11:33 ` Arnd Bergmann -1 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-metag, linux-arm-kernel On Friday, January 6, 2017 10:43:55 AM CET Nicolas Dichtel wrote: > diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h > new file mode 100644 > index 000000000000..8d8285997ba8 > --- /dev/null > +++ b/arch/nios2/include/uapi/asm/setup.h > @@ -0,0 +1,6 @@ > +#ifndef _UAPI_ASM_NIOS2_SETUP_H > +#define _UAPI_ASM_NIOS2_SETUP_H > + > +#include <asm-generic/setup.h> > + > +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ > This one is only a redirect to an asm-generic header, so it can be removed completely and replaced with a line in the arch/nios2/include/uapi/asm/ file: generic-y += setup.h Arnd _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 3/7] nios2: put setup.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (5 preceding siblings ...) (?) @ 2017-01-09 11:33 ` Arnd Bergmann -1 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k On Friday, January 6, 2017 10:43:55 AM CET Nicolas Dichtel wrote: > diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h > new file mode 100644 > index 000000000000..8d8285997ba8 > --- /dev/null > +++ b/arch/nios2/include/uapi/asm/setup.h > @@ -0,0 +1,6 @@ > +#ifndef _UAPI_ASM_NIOS2_SETUP_H > +#define _UAPI_ASM_NIOS2_SETUP_H > + > +#include <asm-generic/setup.h> > + > +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ > This one is only a redirect to an asm-generic header, so it can be removed completely and replaced with a line in the arch/nios2/include/uapi/asm/ file: generic-y += setup.h Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 3/7] nios2: put setup.h in uapi @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: openrisc On Friday, January 6, 2017 10:43:55 AM CET Nicolas Dichtel wrote: > diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h > new file mode 100644 > index 000000000000..8d8285997ba8 > --- /dev/null > +++ b/arch/nios2/include/uapi/asm/setup.h > @@ -0,0 +1,6 @@ > +#ifndef _UAPI_ASM_NIOS2_SETUP_H > +#define _UAPI_ASM_NIOS2_SETUP_H > + > +#include <asm-generic/setup.h> > + > +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ > This one is only a redirect to an asm-generic header, so it can be removed completely and replaced with a line in the arch/nios2/include/uapi/asm/ file: generic-y += setup.h Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 3/7] nios2: put setup.h in uapi @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linux-arm-kernel On Friday, January 6, 2017 10:43:55 AM CET Nicolas Dichtel wrote: > diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h > new file mode 100644 > index 000000000000..8d8285997ba8 > --- /dev/null > +++ b/arch/nios2/include/uapi/asm/setup.h > @@ -0,0 +1,6 @@ > +#ifndef _UAPI_ASM_NIOS2_SETUP_H > +#define _UAPI_ASM_NIOS2_SETUP_H > + > +#include <asm-generic/setup.h> > + > +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ > This one is only a redirect to an asm-generic header, so it can be removed completely and replaced with a line in the arch/nios2/include/uapi/asm/ file: generic-y += setup.h Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 3/7] nios2: put setup.h in uapi @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linux-snps-arc On Friday, January 6, 2017 10:43:55 AM CET Nicolas Dichtel wrote: > diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h > new file mode 100644 > index 000000000000..8d8285997ba8 > --- /dev/null > +++ b/arch/nios2/include/uapi/asm/setup.h > @@ -0,0 +1,6 @@ > +#ifndef _UAPI_ASM_NIOS2_SETUP_H > +#define _UAPI_ASM_NIOS2_SETUP_H > + > +#include <asm-generic/setup.h> > + > +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ > This one is only a redirect to an asm-generic header, so it can be removed completely and replaced with a line in the arch/nios2/include/uapi/asm/ file: generic-y += setup.h Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 3/7] nios2: put setup.h in uapi @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm-kernel, linux-nfs, linux-parisc, linux-cris-kernel, netdev, linux-mmc, linux-kernel, linux-spi, mmarek, netfilter-devel, linux-alpha, nios2-dev, davem On Friday, January 6, 2017 10:43:55 AM CET Nicolas Dichtel wrote: > diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h > new file mode 100644 > index 000000000000..8d8285997ba8 > --- /dev/null > +++ b/arch/nios2/include/uapi/asm/setup.h > @@ -0,0 +1,6 @@ > +#ifndef _UAPI_ASM_NIOS2_SETUP_H > +#define _UAPI_ASM_NIOS2_SETUP_H > + > +#include <asm-generic/setup.h> > + > +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ > This one is only a redirect to an asm-generic header, so it can be removed completely and replaced with a line in the arch/nios2/include/uapi/asm/ file: generic-y += setup.h Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 3/7] nios2: put setup.h in uapi @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm-kernel, linux-nfs, linux-parisc, linux-cris-kernel, netdev, linux-mmc, linux-kernel, linux-spi, mmarek, netfilter-devel, linux-alpha, nios2-dev, davem On Friday, January 6, 2017 10:43:55 AM CET Nicolas Dichtel wrote: > diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h > new file mode 100644 > index 000000000000..8d8285997ba8 > --- /dev/null > +++ b/arch/nios2/include/uapi/asm/setup.h > @@ -0,0 +1,6 @@ > +#ifndef _UAPI_ASM_NIOS2_SETUP_H > +#define _UAPI_ASM_NIOS2_SETUP_H > + > +#include <asm-generic/setup.h> > + > +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ > This one is only a redirect to an asm-generic header, so it can be removed completely and replaced with a line in the arch/nios2/include/uapi/asm/ file: generic-y += setup.h Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 3/7] nios2: put setup.h in uapi @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, o On Friday, January 6, 2017 10:43:55 AM CET Nicolas Dichtel wrote: > diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h > new file mode 100644 > index 000000000000..8d8285997ba8 > --- /dev/null > +++ b/arch/nios2/include/uapi/asm/setup.h > @@ -0,0 +1,6 @@ > +#ifndef _UAPI_ASM_NIOS2_SETUP_H > +#define _UAPI_ASM_NIOS2_SETUP_H > + > +#include <asm-generic/setup.h> > + > +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ > This one is only a redirect to an asm-generic header, so it can be removed completely and replaced with a line in the arch/nios2/include/uapi/asm/ file: generic-y += setup.h Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 3/7] nios2: put setup.h in uapi @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k On Friday, January 6, 2017 10:43:55 AM CET Nicolas Dichtel wrote: > diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h > new file mode 100644 > index 000000000000..8d8285997ba8 > --- /dev/null > +++ b/arch/nios2/include/uapi/asm/setup.h > @@ -0,0 +1,6 @@ > +#ifndef _UAPI_ASM_NIOS2_SETUP_H > +#define _UAPI_ASM_NIOS2_SETUP_H > + > +#include <asm-generic/setup.h> > + > +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ > This one is only a redirect to an asm-generic header, so it can be removed completely and replaced with a line in the arch/nios2/include/uapi/asm/ file: generic-y += setup.h Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 3/7] nios2: put setup.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (9 preceding siblings ...) (?) @ 2017-01-09 11:33 ` Arnd Bergmann -1 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k On Friday, January 6, 2017 10:43:55 AM CET Nicolas Dichtel wrote: > diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h > new file mode 100644 > index 000000000000..8d8285997ba8 > --- /dev/null > +++ b/arch/nios2/include/uapi/asm/setup.h > @@ -0,0 +1,6 @@ > +#ifndef _UAPI_ASM_NIOS2_SETUP_H > +#define _UAPI_ASM_NIOS2_SETUP_H > + > +#include <asm-generic/setup.h> > + > +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ > This one is only a redirect to an asm-generic header, so it can be removed completely and replaced with a line in the arch/nios2/include/uapi/asm/ file: generic-y += setup.h Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 3/7] nios2: put setup.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (11 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/nios2/include/asm/setup.h | 2 +- arch/nios2/include/uapi/asm/setup.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 arch/nios2/include/uapi/asm/setup.h diff --git a/arch/nios2/include/asm/setup.h b/arch/nios2/include/asm/setup.h index dcbf8cf1a344..d49e9e91bf55 100644 --- a/arch/nios2/include/asm/setup.h +++ b/arch/nios2/include/asm/setup.h @@ -19,7 +19,7 @@ #ifndef _ASM_NIOS2_SETUP_H #define _ASM_NIOS2_SETUP_H -#include <asm-generic/setup.h> +#include <uapi/asm/setup.h> #ifndef __ASSEMBLY__ #ifdef __KERNEL__ diff --git a/arch/nios2/include/uapi/asm/setup.h b/arch/nios2/include/uapi/asm/setup.h new file mode 100644 index 000000000000..8d8285997ba8 --- /dev/null +++ b/arch/nios2/include/uapi/asm/setup.h @@ -0,0 +1,6 @@ +#ifndef _UAPI_ASM_NIOS2_SETUP_H +#define _UAPI_ASM_NIOS2_SETUP_H + +#include <asm-generic/setup.h> + +#endif /* _UAPI_ASM_NIOS2_SETUP_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 4/7] x86: put msr-index.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (12 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/x86/include/asm/msr-index.h | 694 +-------------------------------- arch/x86/include/uapi/asm/msr-index.h | 698 ++++++++++++++++++++++++++++++++++ 2 files changed, 699 insertions(+), 693 deletions(-) create mode 100644 arch/x86/include/uapi/asm/msr-index.h diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 710273c617b8..1baa0628da74 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -1,698 +1,6 @@ #ifndef _ASM_X86_MSR_INDEX_H #define _ASM_X86_MSR_INDEX_H -/* - * CPU model specific register (MSR) numbers. - * - * Do not add new entries to this file unless the definitions are shared - * between multiple compilation units. - */ - -/* x86-64 specific MSRs */ -#define MSR_EFER 0xc0000080 /* extended feature register */ -#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ -#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ -#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ -#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ -#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ -#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ -#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ -#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ - -/* EFER bits: */ -#define _EFER_SCE 0 /* SYSCALL/SYSRET */ -#define _EFER_LME 8 /* Long mode enable */ -#define _EFER_LMA 10 /* Long mode active (read-only) */ -#define _EFER_NX 11 /* No execute enable */ -#define _EFER_SVME 12 /* Enable virtualization */ -#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ -#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ - -#define EFER_SCE (1<<_EFER_SCE) -#define EFER_LME (1<<_EFER_LME) -#define EFER_LMA (1<<_EFER_LMA) -#define EFER_NX (1<<_EFER_NX) -#define EFER_SVME (1<<_EFER_SVME) -#define EFER_LMSLE (1<<_EFER_LMSLE) -#define EFER_FFXSR (1<<_EFER_FFXSR) - -/* Intel MSRs. Some also available on other CPUs */ - -#define MSR_PPIN_CTL 0x0000004e -#define MSR_PPIN 0x0000004f - -#define MSR_IA32_PERFCTR0 0x000000c1 -#define MSR_IA32_PERFCTR1 0x000000c2 -#define MSR_FSB_FREQ 0x000000cd -#define MSR_PLATFORM_INFO 0x000000ce - -#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 -#define NHM_C3_AUTO_DEMOTE (1UL << 25) -#define NHM_C1_AUTO_DEMOTE (1UL << 26) -#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) -#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) -#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) - -#define MSR_MTRRcap 0x000000fe -#define MSR_IA32_BBL_CR_CTL 0x00000119 -#define MSR_IA32_BBL_CR_CTL3 0x0000011e - -#define MSR_IA32_SYSENTER_CS 0x00000174 -#define MSR_IA32_SYSENTER_ESP 0x00000175 -#define MSR_IA32_SYSENTER_EIP 0x00000176 - -#define MSR_IA32_MCG_CAP 0x00000179 -#define MSR_IA32_MCG_STATUS 0x0000017a -#define MSR_IA32_MCG_CTL 0x0000017b -#define MSR_IA32_MCG_EXT_CTL 0x000004d0 - -#define MSR_OFFCORE_RSP_0 0x000001a6 -#define MSR_OFFCORE_RSP_1 0x000001a7 -#define MSR_TURBO_RATIO_LIMIT 0x000001ad -#define MSR_TURBO_RATIO_LIMIT1 0x000001ae -#define MSR_TURBO_RATIO_LIMIT2 0x000001af - -#define MSR_LBR_SELECT 0x000001c8 -#define MSR_LBR_TOS 0x000001c9 -#define MSR_LBR_NHM_FROM 0x00000680 -#define MSR_LBR_NHM_TO 0x000006c0 -#define MSR_LBR_CORE_FROM 0x00000040 -#define MSR_LBR_CORE_TO 0x00000060 - -#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ -#define LBR_INFO_MISPRED BIT_ULL(63) -#define LBR_INFO_IN_TX BIT_ULL(62) -#define LBR_INFO_ABORT BIT_ULL(61) -#define LBR_INFO_CYCLES 0xffff - -#define MSR_IA32_PEBS_ENABLE 0x000003f1 -#define MSR_IA32_DS_AREA 0x00000600 -#define MSR_IA32_PERF_CAPABILITIES 0x00000345 -#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 - -#define MSR_IA32_RTIT_CTL 0x00000570 -#define MSR_IA32_RTIT_STATUS 0x00000571 -#define MSR_IA32_RTIT_ADDR0_A 0x00000580 -#define MSR_IA32_RTIT_ADDR0_B 0x00000581 -#define MSR_IA32_RTIT_ADDR1_A 0x00000582 -#define MSR_IA32_RTIT_ADDR1_B 0x00000583 -#define MSR_IA32_RTIT_ADDR2_A 0x00000584 -#define MSR_IA32_RTIT_ADDR2_B 0x00000585 -#define MSR_IA32_RTIT_ADDR3_A 0x00000586 -#define MSR_IA32_RTIT_ADDR3_B 0x00000587 -#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 -#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 -#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 - -#define MSR_MTRRfix64K_00000 0x00000250 -#define MSR_MTRRfix16K_80000 0x00000258 -#define MSR_MTRRfix16K_A0000 0x00000259 -#define MSR_MTRRfix4K_C0000 0x00000268 -#define MSR_MTRRfix4K_C8000 0x00000269 -#define MSR_MTRRfix4K_D0000 0x0000026a -#define MSR_MTRRfix4K_D8000 0x0000026b -#define MSR_MTRRfix4K_E0000 0x0000026c -#define MSR_MTRRfix4K_E8000 0x0000026d -#define MSR_MTRRfix4K_F0000 0x0000026e -#define MSR_MTRRfix4K_F8000 0x0000026f -#define MSR_MTRRdefType 0x000002ff - -#define MSR_IA32_CR_PAT 0x00000277 - -#define MSR_IA32_DEBUGCTLMSR 0x000001d9 -#define MSR_IA32_LASTBRANCHFROMIP 0x000001db -#define MSR_IA32_LASTBRANCHTOIP 0x000001dc -#define MSR_IA32_LASTINTFROMIP 0x000001dd -#define MSR_IA32_LASTINTTOIP 0x000001de - -/* DEBUGCTLMSR bits (others vary by model): */ -#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ -#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ -#define DEBUGCTLMSR_TR (1UL << 6) -#define DEBUGCTLMSR_BTS (1UL << 7) -#define DEBUGCTLMSR_BTINT (1UL << 8) -#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) -#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) -#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) - -#define MSR_PEBS_FRONTEND 0x000003f7 - -#define MSR_IA32_POWER_CTL 0x000001fc - -#define MSR_IA32_MC0_CTL 0x00000400 -#define MSR_IA32_MC0_STATUS 0x00000401 -#define MSR_IA32_MC0_ADDR 0x00000402 -#define MSR_IA32_MC0_MISC 0x00000403 - -/* C-state Residency Counters */ -#define MSR_PKG_C3_RESIDENCY 0x000003f8 -#define MSR_PKG_C6_RESIDENCY 0x000003f9 -#define MSR_PKG_C7_RESIDENCY 0x000003fa -#define MSR_CORE_C3_RESIDENCY 0x000003fc -#define MSR_CORE_C6_RESIDENCY 0x000003fd -#define MSR_CORE_C7_RESIDENCY 0x000003fe -#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff -#define MSR_PKG_C2_RESIDENCY 0x0000060d -#define MSR_PKG_C8_RESIDENCY 0x00000630 -#define MSR_PKG_C9_RESIDENCY 0x00000631 -#define MSR_PKG_C10_RESIDENCY 0x00000632 - -/* Interrupt Response Limit */ -#define MSR_PKGC3_IRTL 0x0000060a -#define MSR_PKGC6_IRTL 0x0000060b -#define MSR_PKGC7_IRTL 0x0000060c -#define MSR_PKGC8_IRTL 0x00000633 -#define MSR_PKGC9_IRTL 0x00000634 -#define MSR_PKGC10_IRTL 0x00000635 - -/* Run Time Average Power Limiting (RAPL) Interface */ - -#define MSR_RAPL_POWER_UNIT 0x00000606 - -#define MSR_PKG_POWER_LIMIT 0x00000610 -#define MSR_PKG_ENERGY_STATUS 0x00000611 -#define MSR_PKG_PERF_STATUS 0x00000613 -#define MSR_PKG_POWER_INFO 0x00000614 - -#define MSR_DRAM_POWER_LIMIT 0x00000618 -#define MSR_DRAM_ENERGY_STATUS 0x00000619 -#define MSR_DRAM_PERF_STATUS 0x0000061b -#define MSR_DRAM_POWER_INFO 0x0000061c - -#define MSR_PP0_POWER_LIMIT 0x00000638 -#define MSR_PP0_ENERGY_STATUS 0x00000639 -#define MSR_PP0_POLICY 0x0000063a -#define MSR_PP0_PERF_STATUS 0x0000063b - -#define MSR_PP1_POWER_LIMIT 0x00000640 -#define MSR_PP1_ENERGY_STATUS 0x00000641 -#define MSR_PP1_POLICY 0x00000642 - -/* Config TDP MSRs */ -#define MSR_CONFIG_TDP_NOMINAL 0x00000648 -#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 -#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A -#define MSR_CONFIG_TDP_CONTROL 0x0000064B -#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C - -#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D - -#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 -#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 -#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A -#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B - -#define MSR_CORE_C1_RES 0x00000660 - -#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 -#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 - -#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 -#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 -#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 - -/* Hardware P state interface */ -#define MSR_PPERF 0x0000064e -#define MSR_PERF_LIMIT_REASONS 0x0000064f -#define MSR_PM_ENABLE 0x00000770 -#define MSR_HWP_CAPABILITIES 0x00000771 -#define MSR_HWP_REQUEST_PKG 0x00000772 -#define MSR_HWP_INTERRUPT 0x00000773 -#define MSR_HWP_REQUEST 0x00000774 -#define MSR_HWP_STATUS 0x00000777 - -/* CPUID.6.EAX */ -#define HWP_BASE_BIT (1<<7) -#define HWP_NOTIFICATIONS_BIT (1<<8) -#define HWP_ACTIVITY_WINDOW_BIT (1<<9) -#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) -#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) - -/* IA32_HWP_CAPABILITIES */ -#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) -#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) -#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) -#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) - -/* IA32_HWP_REQUEST */ -#define HWP_MIN_PERF(x) (x & 0xff) -#define HWP_MAX_PERF(x) ((x & 0xff) << 8) -#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) -#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) -#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) -#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) - -/* IA32_HWP_STATUS */ -#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) - -/* IA32_HWP_INTERRUPT */ -#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) - -#define MSR_AMD64_MC0_MASK 0xc0010044 - -#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) -#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) -#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) -#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) - -#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) - -/* These are consecutive and not in the normal 4er MCE bank block */ -#define MSR_IA32_MC0_CTL2 0x00000280 -#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) - -#define MSR_P6_PERFCTR0 0x000000c1 -#define MSR_P6_PERFCTR1 0x000000c2 -#define MSR_P6_EVNTSEL0 0x00000186 -#define MSR_P6_EVNTSEL1 0x00000187 - -#define MSR_KNC_PERFCTR0 0x00000020 -#define MSR_KNC_PERFCTR1 0x00000021 -#define MSR_KNC_EVNTSEL0 0x00000028 -#define MSR_KNC_EVNTSEL1 0x00000029 - -/* Alternative perfctr range with full access. */ -#define MSR_IA32_PMC0 0x000004c1 - -/* AMD64 MSRs. Not complete. See the architecture manual for a more - complete list. */ - -#define MSR_AMD64_PATCH_LEVEL 0x0000008b -#define MSR_AMD64_TSC_RATIO 0xc0000104 -#define MSR_AMD64_NB_CFG 0xc001001f -#define MSR_AMD64_PATCH_LOADER 0xc0010020 -#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 -#define MSR_AMD64_OSVW_STATUS 0xc0010141 -#define MSR_AMD64_LS_CFG 0xc0011020 -#define MSR_AMD64_DC_CFG 0xc0011022 -#define MSR_AMD64_BU_CFG2 0xc001102a -#define MSR_AMD64_IBSFETCHCTL 0xc0011030 -#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 -#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 -#define MSR_AMD64_IBSFETCH_REG_COUNT 3 -#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) -#define MSR_AMD64_IBSOPCTL 0xc0011033 -#define MSR_AMD64_IBSOPRIP 0xc0011034 -#define MSR_AMD64_IBSOPDATA 0xc0011035 -#define MSR_AMD64_IBSOPDATA2 0xc0011036 -#define MSR_AMD64_IBSOPDATA3 0xc0011037 -#define MSR_AMD64_IBSDCLINAD 0xc0011038 -#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 -#define MSR_AMD64_IBSOP_REG_COUNT 7 -#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) -#define MSR_AMD64_IBSCTL 0xc001103a -#define MSR_AMD64_IBSBRTARGET 0xc001103b -#define MSR_AMD64_IBSOPDATA4 0xc001103d -#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ - -/* Fam 17h MSRs */ -#define MSR_F17H_IRPERF 0xc00000e9 - -/* Fam 16h MSRs */ -#define MSR_F16H_L2I_PERF_CTL 0xc0010230 -#define MSR_F16H_L2I_PERF_CTR 0xc0010231 -#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 -#define MSR_F16H_DR2_ADDR_MASK 0xc001101a -#define MSR_F16H_DR3_ADDR_MASK 0xc001101b -#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 - -/* Fam 15h MSRs */ -#define MSR_F15H_PERF_CTL 0xc0010200 -#define MSR_F15H_PERF_CTR 0xc0010201 -#define MSR_F15H_NB_PERF_CTL 0xc0010240 -#define MSR_F15H_NB_PERF_CTR 0xc0010241 -#define MSR_F15H_PTSC 0xc0010280 -#define MSR_F15H_IC_CFG 0xc0011021 - -/* Fam 10h MSRs */ -#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 -#define FAM10H_MMIO_CONF_ENABLE (1<<0) -#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf -#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 -#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL -#define FAM10H_MMIO_CONF_BASE_SHIFT 20 -#define MSR_FAM10H_NODE_ID 0xc001100c - -/* K8 MSRs */ -#define MSR_K8_TOP_MEM1 0xc001001a -#define MSR_K8_TOP_MEM2 0xc001001d -#define MSR_K8_SYSCFG 0xc0010010 -#define MSR_K8_INT_PENDING_MSG 0xc0010055 -/* C1E active bits in int pending message */ -#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 -#define MSR_K8_TSEG_ADDR 0xc0010112 -#define MSR_K8_TSEG_MASK 0xc0010113 -#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ -#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ -#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ - -/* K7 MSRs */ -#define MSR_K7_EVNTSEL0 0xc0010000 -#define MSR_K7_PERFCTR0 0xc0010004 -#define MSR_K7_EVNTSEL1 0xc0010001 -#define MSR_K7_PERFCTR1 0xc0010005 -#define MSR_K7_EVNTSEL2 0xc0010002 -#define MSR_K7_PERFCTR2 0xc0010006 -#define MSR_K7_EVNTSEL3 0xc0010003 -#define MSR_K7_PERFCTR3 0xc0010007 -#define MSR_K7_CLK_CTL 0xc001001b -#define MSR_K7_HWCR 0xc0010015 -#define MSR_K7_FID_VID_CTL 0xc0010041 -#define MSR_K7_FID_VID_STATUS 0xc0010042 - -/* K6 MSRs */ -#define MSR_K6_WHCR 0xc0000082 -#define MSR_K6_UWCCR 0xc0000085 -#define MSR_K6_EPMR 0xc0000086 -#define MSR_K6_PSOR 0xc0000087 -#define MSR_K6_PFIR 0xc0000088 - -/* Centaur-Hauls/IDT defined MSRs. */ -#define MSR_IDT_FCR1 0x00000107 -#define MSR_IDT_FCR2 0x00000108 -#define MSR_IDT_FCR3 0x00000109 -#define MSR_IDT_FCR4 0x0000010a - -#define MSR_IDT_MCR0 0x00000110 -#define MSR_IDT_MCR1 0x00000111 -#define MSR_IDT_MCR2 0x00000112 -#define MSR_IDT_MCR3 0x00000113 -#define MSR_IDT_MCR4 0x00000114 -#define MSR_IDT_MCR5 0x00000115 -#define MSR_IDT_MCR6 0x00000116 -#define MSR_IDT_MCR7 0x00000117 -#define MSR_IDT_MCR_CTRL 0x00000120 - -/* VIA Cyrix defined MSRs*/ -#define MSR_VIA_FCR 0x00001107 -#define MSR_VIA_LONGHAUL 0x0000110a -#define MSR_VIA_RNG 0x0000110b -#define MSR_VIA_BCR2 0x00001147 - -/* Transmeta defined MSRs */ -#define MSR_TMTA_LONGRUN_CTRL 0x80868010 -#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 -#define MSR_TMTA_LRTI_READOUT 0x80868018 -#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a - -/* Intel defined MSRs. */ -#define MSR_IA32_P5_MC_ADDR 0x00000000 -#define MSR_IA32_P5_MC_TYPE 0x00000001 -#define MSR_IA32_TSC 0x00000010 -#define MSR_IA32_PLATFORM_ID 0x00000017 -#define MSR_IA32_EBL_CR_POWERON 0x0000002a -#define MSR_EBC_FREQUENCY_ID 0x0000002c -#define MSR_SMI_COUNT 0x00000034 -#define MSR_IA32_FEATURE_CONTROL 0x0000003a -#define MSR_IA32_TSC_ADJUST 0x0000003b -#define MSR_IA32_BNDCFGS 0x00000d90 - -#define MSR_IA32_XSS 0x00000da0 - -#define FEATURE_CONTROL_LOCKED (1<<0) -#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) -#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) -#define FEATURE_CONTROL_LMCE (1<<20) - -#define MSR_IA32_APICBASE 0x0000001b -#define MSR_IA32_APICBASE_BSP (1<<8) -#define MSR_IA32_APICBASE_ENABLE (1<<11) -#define MSR_IA32_APICBASE_BASE (0xfffff<<12) - -#define MSR_IA32_TSCDEADLINE 0x000006e0 - -#define MSR_IA32_UCODE_WRITE 0x00000079 -#define MSR_IA32_UCODE_REV 0x0000008b - -#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b -#define MSR_IA32_SMBASE 0x0000009e - -#define MSR_IA32_PERF_STATUS 0x00000198 -#define MSR_IA32_PERF_CTL 0x00000199 -#define INTEL_PERF_CTL_MASK 0xffff -#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 -#define MSR_AMD_PERF_STATUS 0xc0010063 -#define MSR_AMD_PERF_CTL 0xc0010062 - -#define MSR_IA32_MPERF 0x000000e7 -#define MSR_IA32_APERF 0x000000e8 - -#define MSR_IA32_THERM_CONTROL 0x0000019a -#define MSR_IA32_THERM_INTERRUPT 0x0000019b - -#define THERM_INT_HIGH_ENABLE (1 << 0) -#define THERM_INT_LOW_ENABLE (1 << 1) -#define THERM_INT_PLN_ENABLE (1 << 24) - -#define MSR_IA32_THERM_STATUS 0x0000019c - -#define THERM_STATUS_PROCHOT (1 << 0) -#define THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_THERM2_CTL 0x0000019d - -#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) - -#define MSR_IA32_MISC_ENABLE 0x000001a0 - -#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 - -#define MSR_MISC_PWR_MGMT 0x000001aa - -#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 -#define ENERGY_PERF_BIAS_PERFORMANCE 0 -#define ENERGY_PERF_BIAS_NORMAL 6 -#define ENERGY_PERF_BIAS_POWERSAVE 15 - -#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 - -#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) -#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 - -#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) -#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) -#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) - -/* Thermal Thresholds Support */ -#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) -#define THERM_SHIFT_THRESHOLD0 8 -#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) -#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) -#define THERM_SHIFT_THRESHOLD1 16 -#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) -#define THERM_STATUS_THRESHOLD0 (1 << 6) -#define THERM_LOG_THRESHOLD0 (1 << 7) -#define THERM_STATUS_THRESHOLD1 (1 << 8) -#define THERM_LOG_THRESHOLD1 (1 << 9) - -/* MISC_ENABLE bits: architectural */ -#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 -#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) -#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 -#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) -#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 -#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) -#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 -#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 -#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) - -/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ -#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 -#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) -#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 -#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) -#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 -#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) - -#define MSR_IA32_TSC_DEADLINE 0x000006E0 - -/* P4/Xeon+ specific */ -#define MSR_IA32_MCG_EAX 0x00000180 -#define MSR_IA32_MCG_EBX 0x00000181 -#define MSR_IA32_MCG_ECX 0x00000182 -#define MSR_IA32_MCG_EDX 0x00000183 -#define MSR_IA32_MCG_ESI 0x00000184 -#define MSR_IA32_MCG_EDI 0x00000185 -#define MSR_IA32_MCG_EBP 0x00000186 -#define MSR_IA32_MCG_ESP 0x00000187 -#define MSR_IA32_MCG_EFLAGS 0x00000188 -#define MSR_IA32_MCG_EIP 0x00000189 -#define MSR_IA32_MCG_RESERVED 0x0000018a - -/* Pentium IV performance counter MSRs */ -#define MSR_P4_BPU_PERFCTR0 0x00000300 -#define MSR_P4_BPU_PERFCTR1 0x00000301 -#define MSR_P4_BPU_PERFCTR2 0x00000302 -#define MSR_P4_BPU_PERFCTR3 0x00000303 -#define MSR_P4_MS_PERFCTR0 0x00000304 -#define MSR_P4_MS_PERFCTR1 0x00000305 -#define MSR_P4_MS_PERFCTR2 0x00000306 -#define MSR_P4_MS_PERFCTR3 0x00000307 -#define MSR_P4_FLAME_PERFCTR0 0x00000308 -#define MSR_P4_FLAME_PERFCTR1 0x00000309 -#define MSR_P4_FLAME_PERFCTR2 0x0000030a -#define MSR_P4_FLAME_PERFCTR3 0x0000030b -#define MSR_P4_IQ_PERFCTR0 0x0000030c -#define MSR_P4_IQ_PERFCTR1 0x0000030d -#define MSR_P4_IQ_PERFCTR2 0x0000030e -#define MSR_P4_IQ_PERFCTR3 0x0000030f -#define MSR_P4_IQ_PERFCTR4 0x00000310 -#define MSR_P4_IQ_PERFCTR5 0x00000311 -#define MSR_P4_BPU_CCCR0 0x00000360 -#define MSR_P4_BPU_CCCR1 0x00000361 -#define MSR_P4_BPU_CCCR2 0x00000362 -#define MSR_P4_BPU_CCCR3 0x00000363 -#define MSR_P4_MS_CCCR0 0x00000364 -#define MSR_P4_MS_CCCR1 0x00000365 -#define MSR_P4_MS_CCCR2 0x00000366 -#define MSR_P4_MS_CCCR3 0x00000367 -#define MSR_P4_FLAME_CCCR0 0x00000368 -#define MSR_P4_FLAME_CCCR1 0x00000369 -#define MSR_P4_FLAME_CCCR2 0x0000036a -#define MSR_P4_FLAME_CCCR3 0x0000036b -#define MSR_P4_IQ_CCCR0 0x0000036c -#define MSR_P4_IQ_CCCR1 0x0000036d -#define MSR_P4_IQ_CCCR2 0x0000036e -#define MSR_P4_IQ_CCCR3 0x0000036f -#define MSR_P4_IQ_CCCR4 0x00000370 -#define MSR_P4_IQ_CCCR5 0x00000371 -#define MSR_P4_ALF_ESCR0 0x000003ca -#define MSR_P4_ALF_ESCR1 0x000003cb -#define MSR_P4_BPU_ESCR0 0x000003b2 -#define MSR_P4_BPU_ESCR1 0x000003b3 -#define MSR_P4_BSU_ESCR0 0x000003a0 -#define MSR_P4_BSU_ESCR1 0x000003a1 -#define MSR_P4_CRU_ESCR0 0x000003b8 -#define MSR_P4_CRU_ESCR1 0x000003b9 -#define MSR_P4_CRU_ESCR2 0x000003cc -#define MSR_P4_CRU_ESCR3 0x000003cd -#define MSR_P4_CRU_ESCR4 0x000003e0 -#define MSR_P4_CRU_ESCR5 0x000003e1 -#define MSR_P4_DAC_ESCR0 0x000003a8 -#define MSR_P4_DAC_ESCR1 0x000003a9 -#define MSR_P4_FIRM_ESCR0 0x000003a4 -#define MSR_P4_FIRM_ESCR1 0x000003a5 -#define MSR_P4_FLAME_ESCR0 0x000003a6 -#define MSR_P4_FLAME_ESCR1 0x000003a7 -#define MSR_P4_FSB_ESCR0 0x000003a2 -#define MSR_P4_FSB_ESCR1 0x000003a3 -#define MSR_P4_IQ_ESCR0 0x000003ba -#define MSR_P4_IQ_ESCR1 0x000003bb -#define MSR_P4_IS_ESCR0 0x000003b4 -#define MSR_P4_IS_ESCR1 0x000003b5 -#define MSR_P4_ITLB_ESCR0 0x000003b6 -#define MSR_P4_ITLB_ESCR1 0x000003b7 -#define MSR_P4_IX_ESCR0 0x000003c8 -#define MSR_P4_IX_ESCR1 0x000003c9 -#define MSR_P4_MOB_ESCR0 0x000003aa -#define MSR_P4_MOB_ESCR1 0x000003ab -#define MSR_P4_MS_ESCR0 0x000003c0 -#define MSR_P4_MS_ESCR1 0x000003c1 -#define MSR_P4_PMH_ESCR0 0x000003ac -#define MSR_P4_PMH_ESCR1 0x000003ad -#define MSR_P4_RAT_ESCR0 0x000003bc -#define MSR_P4_RAT_ESCR1 0x000003bd -#define MSR_P4_SAAT_ESCR0 0x000003ae -#define MSR_P4_SAAT_ESCR1 0x000003af -#define MSR_P4_SSU_ESCR0 0x000003be -#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ - -#define MSR_P4_TBPU_ESCR0 0x000003c2 -#define MSR_P4_TBPU_ESCR1 0x000003c3 -#define MSR_P4_TC_ESCR0 0x000003c4 -#define MSR_P4_TC_ESCR1 0x000003c5 -#define MSR_P4_U2L_ESCR0 0x000003b0 -#define MSR_P4_U2L_ESCR1 0x000003b1 - -#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 - -/* Intel Core-based CPU performance counters */ -#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 -#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a -#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b -#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d -#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e -#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f -#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 - -/* Geode defined MSRs */ -#define MSR_GEODE_BUSCONT_CONF0 0x00001900 - -/* Intel VT MSRs */ -#define MSR_IA32_VMX_BASIC 0x00000480 -#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 -#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 -#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 -#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 -#define MSR_IA32_VMX_MISC 0x00000485 -#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 -#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 -#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 -#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 -#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a -#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b -#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c -#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d -#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e -#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f -#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 -#define MSR_IA32_VMX_VMFUNC 0x00000491 - -/* VMX_BASIC bits and bitmasks */ -#define VMX_BASIC_VMCS_SIZE_SHIFT 32 -#define VMX_BASIC_TRUE_CTLS (1ULL << 55) -#define VMX_BASIC_64 0x0001000000000000LLU -#define VMX_BASIC_MEM_TYPE_SHIFT 50 -#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU -#define VMX_BASIC_MEM_TYPE_WB 6LLU -#define VMX_BASIC_INOUT 0x0040000000000000LLU - -/* MSR_IA32_VMX_MISC bits */ -#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) -#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F -/* AMD-V MSRs */ - -#define MSR_VM_CR 0xc0010114 -#define MSR_VM_IGNNE 0xc0010115 -#define MSR_VM_HSAVE_PA 0xc0010117 +#include <uapi/asm/msr-index.h> #endif /* _ASM_X86_MSR_INDEX_H */ diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h new file mode 100644 index 000000000000..d097e832ee3c --- /dev/null +++ b/arch/x86/include/uapi/asm/msr-index.h @@ -0,0 +1,698 @@ +#ifndef _UAPI_ASM_X86_MSR_INDEX_H +#define _UAPI_ASM_X86_MSR_INDEX_H + +/* + * CPU model specific register (MSR) numbers. + * + * Do not add new entries to this file unless the definitions are shared + * between multiple compilation units. + */ + +/* x86-64 specific MSRs */ +#define MSR_EFER 0xc0000080 /* extended feature register */ +#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ +#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ +#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ +#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ +#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ +#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ +#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ +#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ + +/* EFER bits: */ +#define _EFER_SCE 0 /* SYSCALL/SYSRET */ +#define _EFER_LME 8 /* Long mode enable */ +#define _EFER_LMA 10 /* Long mode active (read-only) */ +#define _EFER_NX 11 /* No execute enable */ +#define _EFER_SVME 12 /* Enable virtualization */ +#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ +#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ + +#define EFER_SCE (1<<_EFER_SCE) +#define EFER_LME (1<<_EFER_LME) +#define EFER_LMA (1<<_EFER_LMA) +#define EFER_NX (1<<_EFER_NX) +#define EFER_SVME (1<<_EFER_SVME) +#define EFER_LMSLE (1<<_EFER_LMSLE) +#define EFER_FFXSR (1<<_EFER_FFXSR) + +/* Intel MSRs. Some also available on other CPUs */ + +#define MSR_PPIN_CTL 0x0000004e +#define MSR_PPIN 0x0000004f + +#define MSR_IA32_PERFCTR0 0x000000c1 +#define MSR_IA32_PERFCTR1 0x000000c2 +#define MSR_FSB_FREQ 0x000000cd +#define MSR_PLATFORM_INFO 0x000000ce + +#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 +#define NHM_C3_AUTO_DEMOTE (1UL << 25) +#define NHM_C1_AUTO_DEMOTE (1UL << 26) +#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) +#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) +#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) + +#define MSR_MTRRcap 0x000000fe +#define MSR_IA32_BBL_CR_CTL 0x00000119 +#define MSR_IA32_BBL_CR_CTL3 0x0000011e + +#define MSR_IA32_SYSENTER_CS 0x00000174 +#define MSR_IA32_SYSENTER_ESP 0x00000175 +#define MSR_IA32_SYSENTER_EIP 0x00000176 + +#define MSR_IA32_MCG_CAP 0x00000179 +#define MSR_IA32_MCG_STATUS 0x0000017a +#define MSR_IA32_MCG_CTL 0x0000017b +#define MSR_IA32_MCG_EXT_CTL 0x000004d0 + +#define MSR_OFFCORE_RSP_0 0x000001a6 +#define MSR_OFFCORE_RSP_1 0x000001a7 +#define MSR_TURBO_RATIO_LIMIT 0x000001ad +#define MSR_TURBO_RATIO_LIMIT1 0x000001ae +#define MSR_TURBO_RATIO_LIMIT2 0x000001af + +#define MSR_LBR_SELECT 0x000001c8 +#define MSR_LBR_TOS 0x000001c9 +#define MSR_LBR_NHM_FROM 0x00000680 +#define MSR_LBR_NHM_TO 0x000006c0 +#define MSR_LBR_CORE_FROM 0x00000040 +#define MSR_LBR_CORE_TO 0x00000060 + +#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ +#define LBR_INFO_MISPRED BIT_ULL(63) +#define LBR_INFO_IN_TX BIT_ULL(62) +#define LBR_INFO_ABORT BIT_ULL(61) +#define LBR_INFO_CYCLES 0xffff + +#define MSR_IA32_PEBS_ENABLE 0x000003f1 +#define MSR_IA32_DS_AREA 0x00000600 +#define MSR_IA32_PERF_CAPABILITIES 0x00000345 +#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 + +#define MSR_IA32_RTIT_CTL 0x00000570 +#define MSR_IA32_RTIT_STATUS 0x00000571 +#define MSR_IA32_RTIT_ADDR0_A 0x00000580 +#define MSR_IA32_RTIT_ADDR0_B 0x00000581 +#define MSR_IA32_RTIT_ADDR1_A 0x00000582 +#define MSR_IA32_RTIT_ADDR1_B 0x00000583 +#define MSR_IA32_RTIT_ADDR2_A 0x00000584 +#define MSR_IA32_RTIT_ADDR2_B 0x00000585 +#define MSR_IA32_RTIT_ADDR3_A 0x00000586 +#define MSR_IA32_RTIT_ADDR3_B 0x00000587 +#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 +#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 +#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 + +#define MSR_MTRRfix64K_00000 0x00000250 +#define MSR_MTRRfix16K_80000 0x00000258 +#define MSR_MTRRfix16K_A0000 0x00000259 +#define MSR_MTRRfix4K_C0000 0x00000268 +#define MSR_MTRRfix4K_C8000 0x00000269 +#define MSR_MTRRfix4K_D0000 0x0000026a +#define MSR_MTRRfix4K_D8000 0x0000026b +#define MSR_MTRRfix4K_E0000 0x0000026c +#define MSR_MTRRfix4K_E8000 0x0000026d +#define MSR_MTRRfix4K_F0000 0x0000026e +#define MSR_MTRRfix4K_F8000 0x0000026f +#define MSR_MTRRdefType 0x000002ff + +#define MSR_IA32_CR_PAT 0x00000277 + +#define MSR_IA32_DEBUGCTLMSR 0x000001d9 +#define MSR_IA32_LASTBRANCHFROMIP 0x000001db +#define MSR_IA32_LASTBRANCHTOIP 0x000001dc +#define MSR_IA32_LASTINTFROMIP 0x000001dd +#define MSR_IA32_LASTINTTOIP 0x000001de + +/* DEBUGCTLMSR bits (others vary by model): */ +#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ +#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ +#define DEBUGCTLMSR_TR (1UL << 6) +#define DEBUGCTLMSR_BTS (1UL << 7) +#define DEBUGCTLMSR_BTINT (1UL << 8) +#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) +#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) +#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) + +#define MSR_PEBS_FRONTEND 0x000003f7 + +#define MSR_IA32_POWER_CTL 0x000001fc + +#define MSR_IA32_MC0_CTL 0x00000400 +#define MSR_IA32_MC0_STATUS 0x00000401 +#define MSR_IA32_MC0_ADDR 0x00000402 +#define MSR_IA32_MC0_MISC 0x00000403 + +/* C-state Residency Counters */ +#define MSR_PKG_C3_RESIDENCY 0x000003f8 +#define MSR_PKG_C6_RESIDENCY 0x000003f9 +#define MSR_PKG_C7_RESIDENCY 0x000003fa +#define MSR_CORE_C3_RESIDENCY 0x000003fc +#define MSR_CORE_C6_RESIDENCY 0x000003fd +#define MSR_CORE_C7_RESIDENCY 0x000003fe +#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff +#define MSR_PKG_C2_RESIDENCY 0x0000060d +#define MSR_PKG_C8_RESIDENCY 0x00000630 +#define MSR_PKG_C9_RESIDENCY 0x00000631 +#define MSR_PKG_C10_RESIDENCY 0x00000632 + +/* Interrupt Response Limit */ +#define MSR_PKGC3_IRTL 0x0000060a +#define MSR_PKGC6_IRTL 0x0000060b +#define MSR_PKGC7_IRTL 0x0000060c +#define MSR_PKGC8_IRTL 0x00000633 +#define MSR_PKGC9_IRTL 0x00000634 +#define MSR_PKGC10_IRTL 0x00000635 + +/* Run Time Average Power Limiting (RAPL) Interface */ + +#define MSR_RAPL_POWER_UNIT 0x00000606 + +#define MSR_PKG_POWER_LIMIT 0x00000610 +#define MSR_PKG_ENERGY_STATUS 0x00000611 +#define MSR_PKG_PERF_STATUS 0x00000613 +#define MSR_PKG_POWER_INFO 0x00000614 + +#define MSR_DRAM_POWER_LIMIT 0x00000618 +#define MSR_DRAM_ENERGY_STATUS 0x00000619 +#define MSR_DRAM_PERF_STATUS 0x0000061b +#define MSR_DRAM_POWER_INFO 0x0000061c + +#define MSR_PP0_POWER_LIMIT 0x00000638 +#define MSR_PP0_ENERGY_STATUS 0x00000639 +#define MSR_PP0_POLICY 0x0000063a +#define MSR_PP0_PERF_STATUS 0x0000063b + +#define MSR_PP1_POWER_LIMIT 0x00000640 +#define MSR_PP1_ENERGY_STATUS 0x00000641 +#define MSR_PP1_POLICY 0x00000642 + +/* Config TDP MSRs */ +#define MSR_CONFIG_TDP_NOMINAL 0x00000648 +#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 +#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A +#define MSR_CONFIG_TDP_CONTROL 0x0000064B +#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C + +#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D + +#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 +#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 +#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A +#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B + +#define MSR_CORE_C1_RES 0x00000660 + +#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 +#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 + +#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 +#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 +#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 + +/* Hardware P state interface */ +#define MSR_PPERF 0x0000064e +#define MSR_PERF_LIMIT_REASONS 0x0000064f +#define MSR_PM_ENABLE 0x00000770 +#define MSR_HWP_CAPABILITIES 0x00000771 +#define MSR_HWP_REQUEST_PKG 0x00000772 +#define MSR_HWP_INTERRUPT 0x00000773 +#define MSR_HWP_REQUEST 0x00000774 +#define MSR_HWP_STATUS 0x00000777 + +/* CPUID.6.EAX */ +#define HWP_BASE_BIT (1<<7) +#define HWP_NOTIFICATIONS_BIT (1<<8) +#define HWP_ACTIVITY_WINDOW_BIT (1<<9) +#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) +#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) + +/* IA32_HWP_CAPABILITIES */ +#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) +#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) +#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) +#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) + +/* IA32_HWP_REQUEST */ +#define HWP_MIN_PERF(x) (x & 0xff) +#define HWP_MAX_PERF(x) ((x & 0xff) << 8) +#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) +#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) +#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) +#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) + +/* IA32_HWP_STATUS */ +#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) + +/* IA32_HWP_INTERRUPT */ +#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) + +#define MSR_AMD64_MC0_MASK 0xc0010044 + +#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) +#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) +#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) +#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) + +#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) + +/* These are consecutive and not in the normal 4er MCE bank block */ +#define MSR_IA32_MC0_CTL2 0x00000280 +#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) + +#define MSR_P6_PERFCTR0 0x000000c1 +#define MSR_P6_PERFCTR1 0x000000c2 +#define MSR_P6_EVNTSEL0 0x00000186 +#define MSR_P6_EVNTSEL1 0x00000187 + +#define MSR_KNC_PERFCTR0 0x00000020 +#define MSR_KNC_PERFCTR1 0x00000021 +#define MSR_KNC_EVNTSEL0 0x00000028 +#define MSR_KNC_EVNTSEL1 0x00000029 + +/* Alternative perfctr range with full access. */ +#define MSR_IA32_PMC0 0x000004c1 + +/* AMD64 MSRs. Not complete. See the architecture manual for a more + complete list. */ + +#define MSR_AMD64_PATCH_LEVEL 0x0000008b +#define MSR_AMD64_TSC_RATIO 0xc0000104 +#define MSR_AMD64_NB_CFG 0xc001001f +#define MSR_AMD64_PATCH_LOADER 0xc0010020 +#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 +#define MSR_AMD64_OSVW_STATUS 0xc0010141 +#define MSR_AMD64_LS_CFG 0xc0011020 +#define MSR_AMD64_DC_CFG 0xc0011022 +#define MSR_AMD64_BU_CFG2 0xc001102a +#define MSR_AMD64_IBSFETCHCTL 0xc0011030 +#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 +#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 +#define MSR_AMD64_IBSFETCH_REG_COUNT 3 +#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) +#define MSR_AMD64_IBSOPCTL 0xc0011033 +#define MSR_AMD64_IBSOPRIP 0xc0011034 +#define MSR_AMD64_IBSOPDATA 0xc0011035 +#define MSR_AMD64_IBSOPDATA2 0xc0011036 +#define MSR_AMD64_IBSOPDATA3 0xc0011037 +#define MSR_AMD64_IBSDCLINAD 0xc0011038 +#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 +#define MSR_AMD64_IBSOP_REG_COUNT 7 +#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) +#define MSR_AMD64_IBSCTL 0xc001103a +#define MSR_AMD64_IBSBRTARGET 0xc001103b +#define MSR_AMD64_IBSOPDATA4 0xc001103d +#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ + +/* Fam 17h MSRs */ +#define MSR_F17H_IRPERF 0xc00000e9 + +/* Fam 16h MSRs */ +#define MSR_F16H_L2I_PERF_CTL 0xc0010230 +#define MSR_F16H_L2I_PERF_CTR 0xc0010231 +#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 +#define MSR_F16H_DR2_ADDR_MASK 0xc001101a +#define MSR_F16H_DR3_ADDR_MASK 0xc001101b +#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 + +/* Fam 15h MSRs */ +#define MSR_F15H_PERF_CTL 0xc0010200 +#define MSR_F15H_PERF_CTR 0xc0010201 +#define MSR_F15H_NB_PERF_CTL 0xc0010240 +#define MSR_F15H_NB_PERF_CTR 0xc0010241 +#define MSR_F15H_PTSC 0xc0010280 +#define MSR_F15H_IC_CFG 0xc0011021 + +/* Fam 10h MSRs */ +#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 +#define FAM10H_MMIO_CONF_ENABLE (1<<0) +#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf +#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 +#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL +#define FAM10H_MMIO_CONF_BASE_SHIFT 20 +#define MSR_FAM10H_NODE_ID 0xc001100c + +/* K8 MSRs */ +#define MSR_K8_TOP_MEM1 0xc001001a +#define MSR_K8_TOP_MEM2 0xc001001d +#define MSR_K8_SYSCFG 0xc0010010 +#define MSR_K8_INT_PENDING_MSG 0xc0010055 +/* C1E active bits in int pending message */ +#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 +#define MSR_K8_TSEG_ADDR 0xc0010112 +#define MSR_K8_TSEG_MASK 0xc0010113 +#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ +#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ +#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ + +/* K7 MSRs */ +#define MSR_K7_EVNTSEL0 0xc0010000 +#define MSR_K7_PERFCTR0 0xc0010004 +#define MSR_K7_EVNTSEL1 0xc0010001 +#define MSR_K7_PERFCTR1 0xc0010005 +#define MSR_K7_EVNTSEL2 0xc0010002 +#define MSR_K7_PERFCTR2 0xc0010006 +#define MSR_K7_EVNTSEL3 0xc0010003 +#define MSR_K7_PERFCTR3 0xc0010007 +#define MSR_K7_CLK_CTL 0xc001001b +#define MSR_K7_HWCR 0xc0010015 +#define MSR_K7_FID_VID_CTL 0xc0010041 +#define MSR_K7_FID_VID_STATUS 0xc0010042 + +/* K6 MSRs */ +#define MSR_K6_WHCR 0xc0000082 +#define MSR_K6_UWCCR 0xc0000085 +#define MSR_K6_EPMR 0xc0000086 +#define MSR_K6_PSOR 0xc0000087 +#define MSR_K6_PFIR 0xc0000088 + +/* Centaur-Hauls/IDT defined MSRs. */ +#define MSR_IDT_FCR1 0x00000107 +#define MSR_IDT_FCR2 0x00000108 +#define MSR_IDT_FCR3 0x00000109 +#define MSR_IDT_FCR4 0x0000010a + +#define MSR_IDT_MCR0 0x00000110 +#define MSR_IDT_MCR1 0x00000111 +#define MSR_IDT_MCR2 0x00000112 +#define MSR_IDT_MCR3 0x00000113 +#define MSR_IDT_MCR4 0x00000114 +#define MSR_IDT_MCR5 0x00000115 +#define MSR_IDT_MCR6 0x00000116 +#define MSR_IDT_MCR7 0x00000117 +#define MSR_IDT_MCR_CTRL 0x00000120 + +/* VIA Cyrix defined MSRs*/ +#define MSR_VIA_FCR 0x00001107 +#define MSR_VIA_LONGHAUL 0x0000110a +#define MSR_VIA_RNG 0x0000110b +#define MSR_VIA_BCR2 0x00001147 + +/* Transmeta defined MSRs */ +#define MSR_TMTA_LONGRUN_CTRL 0x80868010 +#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 +#define MSR_TMTA_LRTI_READOUT 0x80868018 +#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a + +/* Intel defined MSRs. */ +#define MSR_IA32_P5_MC_ADDR 0x00000000 +#define MSR_IA32_P5_MC_TYPE 0x00000001 +#define MSR_IA32_TSC 0x00000010 +#define MSR_IA32_PLATFORM_ID 0x00000017 +#define MSR_IA32_EBL_CR_POWERON 0x0000002a +#define MSR_EBC_FREQUENCY_ID 0x0000002c +#define MSR_SMI_COUNT 0x00000034 +#define MSR_IA32_FEATURE_CONTROL 0x0000003a +#define MSR_IA32_TSC_ADJUST 0x0000003b +#define MSR_IA32_BNDCFGS 0x00000d90 + +#define MSR_IA32_XSS 0x00000da0 + +#define FEATURE_CONTROL_LOCKED (1<<0) +#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) +#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) +#define FEATURE_CONTROL_LMCE (1<<20) + +#define MSR_IA32_APICBASE 0x0000001b +#define MSR_IA32_APICBASE_BSP (1<<8) +#define MSR_IA32_APICBASE_ENABLE (1<<11) +#define MSR_IA32_APICBASE_BASE (0xfffff<<12) + +#define MSR_IA32_TSCDEADLINE 0x000006e0 + +#define MSR_IA32_UCODE_WRITE 0x00000079 +#define MSR_IA32_UCODE_REV 0x0000008b + +#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b +#define MSR_IA32_SMBASE 0x0000009e + +#define MSR_IA32_PERF_STATUS 0x00000198 +#define MSR_IA32_PERF_CTL 0x00000199 +#define INTEL_PERF_CTL_MASK 0xffff +#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 +#define MSR_AMD_PERF_STATUS 0xc0010063 +#define MSR_AMD_PERF_CTL 0xc0010062 + +#define MSR_IA32_MPERF 0x000000e7 +#define MSR_IA32_APERF 0x000000e8 + +#define MSR_IA32_THERM_CONTROL 0x0000019a +#define MSR_IA32_THERM_INTERRUPT 0x0000019b + +#define THERM_INT_HIGH_ENABLE (1 << 0) +#define THERM_INT_LOW_ENABLE (1 << 1) +#define THERM_INT_PLN_ENABLE (1 << 24) + +#define MSR_IA32_THERM_STATUS 0x0000019c + +#define THERM_STATUS_PROCHOT (1 << 0) +#define THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_THERM2_CTL 0x0000019d + +#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) + +#define MSR_IA32_MISC_ENABLE 0x000001a0 + +#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 + +#define MSR_MISC_PWR_MGMT 0x000001aa + +#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 +#define ENERGY_PERF_BIAS_PERFORMANCE 0 +#define ENERGY_PERF_BIAS_NORMAL 6 +#define ENERGY_PERF_BIAS_POWERSAVE 15 + +#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 + +#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) +#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 + +#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) +#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) +#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) + +/* Thermal Thresholds Support */ +#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) +#define THERM_SHIFT_THRESHOLD0 8 +#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) +#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) +#define THERM_SHIFT_THRESHOLD1 16 +#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) +#define THERM_STATUS_THRESHOLD0 (1 << 6) +#define THERM_LOG_THRESHOLD0 (1 << 7) +#define THERM_STATUS_THRESHOLD1 (1 << 8) +#define THERM_LOG_THRESHOLD1 (1 << 9) + +/* MISC_ENABLE bits: architectural */ +#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 +#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) +#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 +#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) +#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 +#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) +#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 +#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 +#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) + +/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ +#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 +#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) +#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 +#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) +#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 +#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) + +#define MSR_IA32_TSC_DEADLINE 0x000006E0 + +/* P4/Xeon+ specific */ +#define MSR_IA32_MCG_EAX 0x00000180 +#define MSR_IA32_MCG_EBX 0x00000181 +#define MSR_IA32_MCG_ECX 0x00000182 +#define MSR_IA32_MCG_EDX 0x00000183 +#define MSR_IA32_MCG_ESI 0x00000184 +#define MSR_IA32_MCG_EDI 0x00000185 +#define MSR_IA32_MCG_EBP 0x00000186 +#define MSR_IA32_MCG_ESP 0x00000187 +#define MSR_IA32_MCG_EFLAGS 0x00000188 +#define MSR_IA32_MCG_EIP 0x00000189 +#define MSR_IA32_MCG_RESERVED 0x0000018a + +/* Pentium IV performance counter MSRs */ +#define MSR_P4_BPU_PERFCTR0 0x00000300 +#define MSR_P4_BPU_PERFCTR1 0x00000301 +#define MSR_P4_BPU_PERFCTR2 0x00000302 +#define MSR_P4_BPU_PERFCTR3 0x00000303 +#define MSR_P4_MS_PERFCTR0 0x00000304 +#define MSR_P4_MS_PERFCTR1 0x00000305 +#define MSR_P4_MS_PERFCTR2 0x00000306 +#define MSR_P4_MS_PERFCTR3 0x00000307 +#define MSR_P4_FLAME_PERFCTR0 0x00000308 +#define MSR_P4_FLAME_PERFCTR1 0x00000309 +#define MSR_P4_FLAME_PERFCTR2 0x0000030a +#define MSR_P4_FLAME_PERFCTR3 0x0000030b +#define MSR_P4_IQ_PERFCTR0 0x0000030c +#define MSR_P4_IQ_PERFCTR1 0x0000030d +#define MSR_P4_IQ_PERFCTR2 0x0000030e +#define MSR_P4_IQ_PERFCTR3 0x0000030f +#define MSR_P4_IQ_PERFCTR4 0x00000310 +#define MSR_P4_IQ_PERFCTR5 0x00000311 +#define MSR_P4_BPU_CCCR0 0x00000360 +#define MSR_P4_BPU_CCCR1 0x00000361 +#define MSR_P4_BPU_CCCR2 0x00000362 +#define MSR_P4_BPU_CCCR3 0x00000363 +#define MSR_P4_MS_CCCR0 0x00000364 +#define MSR_P4_MS_CCCR1 0x00000365 +#define MSR_P4_MS_CCCR2 0x00000366 +#define MSR_P4_MS_CCCR3 0x00000367 +#define MSR_P4_FLAME_CCCR0 0x00000368 +#define MSR_P4_FLAME_CCCR1 0x00000369 +#define MSR_P4_FLAME_CCCR2 0x0000036a +#define MSR_P4_FLAME_CCCR3 0x0000036b +#define MSR_P4_IQ_CCCR0 0x0000036c +#define MSR_P4_IQ_CCCR1 0x0000036d +#define MSR_P4_IQ_CCCR2 0x0000036e +#define MSR_P4_IQ_CCCR3 0x0000036f +#define MSR_P4_IQ_CCCR4 0x00000370 +#define MSR_P4_IQ_CCCR5 0x00000371 +#define MSR_P4_ALF_ESCR0 0x000003ca +#define MSR_P4_ALF_ESCR1 0x000003cb +#define MSR_P4_BPU_ESCR0 0x000003b2 +#define MSR_P4_BPU_ESCR1 0x000003b3 +#define MSR_P4_BSU_ESCR0 0x000003a0 +#define MSR_P4_BSU_ESCR1 0x000003a1 +#define MSR_P4_CRU_ESCR0 0x000003b8 +#define MSR_P4_CRU_ESCR1 0x000003b9 +#define MSR_P4_CRU_ESCR2 0x000003cc +#define MSR_P4_CRU_ESCR3 0x000003cd +#define MSR_P4_CRU_ESCR4 0x000003e0 +#define MSR_P4_CRU_ESCR5 0x000003e1 +#define MSR_P4_DAC_ESCR0 0x000003a8 +#define MSR_P4_DAC_ESCR1 0x000003a9 +#define MSR_P4_FIRM_ESCR0 0x000003a4 +#define MSR_P4_FIRM_ESCR1 0x000003a5 +#define MSR_P4_FLAME_ESCR0 0x000003a6 +#define MSR_P4_FLAME_ESCR1 0x000003a7 +#define MSR_P4_FSB_ESCR0 0x000003a2 +#define MSR_P4_FSB_ESCR1 0x000003a3 +#define MSR_P4_IQ_ESCR0 0x000003ba +#define MSR_P4_IQ_ESCR1 0x000003bb +#define MSR_P4_IS_ESCR0 0x000003b4 +#define MSR_P4_IS_ESCR1 0x000003b5 +#define MSR_P4_ITLB_ESCR0 0x000003b6 +#define MSR_P4_ITLB_ESCR1 0x000003b7 +#define MSR_P4_IX_ESCR0 0x000003c8 +#define MSR_P4_IX_ESCR1 0x000003c9 +#define MSR_P4_MOB_ESCR0 0x000003aa +#define MSR_P4_MOB_ESCR1 0x000003ab +#define MSR_P4_MS_ESCR0 0x000003c0 +#define MSR_P4_MS_ESCR1 0x000003c1 +#define MSR_P4_PMH_ESCR0 0x000003ac +#define MSR_P4_PMH_ESCR1 0x000003ad +#define MSR_P4_RAT_ESCR0 0x000003bc +#define MSR_P4_RAT_ESCR1 0x000003bd +#define MSR_P4_SAAT_ESCR0 0x000003ae +#define MSR_P4_SAAT_ESCR1 0x000003af +#define MSR_P4_SSU_ESCR0 0x000003be +#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ + +#define MSR_P4_TBPU_ESCR0 0x000003c2 +#define MSR_P4_TBPU_ESCR1 0x000003c3 +#define MSR_P4_TC_ESCR0 0x000003c4 +#define MSR_P4_TC_ESCR1 0x000003c5 +#define MSR_P4_U2L_ESCR0 0x000003b0 +#define MSR_P4_U2L_ESCR1 0x000003b1 + +#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 + +/* Intel Core-based CPU performance counters */ +#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 +#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a +#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b +#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d +#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e +#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f +#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 + +/* Geode defined MSRs */ +#define MSR_GEODE_BUSCONT_CONF0 0x00001900 + +/* Intel VT MSRs */ +#define MSR_IA32_VMX_BASIC 0x00000480 +#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 +#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 +#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 +#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 +#define MSR_IA32_VMX_MISC 0x00000485 +#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 +#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 +#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 +#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 +#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a +#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b +#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c +#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d +#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e +#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f +#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 +#define MSR_IA32_VMX_VMFUNC 0x00000491 + +/* VMX_BASIC bits and bitmasks */ +#define VMX_BASIC_VMCS_SIZE_SHIFT 32 +#define VMX_BASIC_TRUE_CTLS (1ULL << 55) +#define VMX_BASIC_64 0x0001000000000000LLU +#define VMX_BASIC_MEM_TYPE_SHIFT 50 +#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU +#define VMX_BASIC_MEM_TYPE_WB 6LLU +#define VMX_BASIC_INOUT 0x0040000000000000LLU + +/* MSR_IA32_VMX_MISC bits */ +#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) +#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F +/* AMD-V MSRs */ + +#define MSR_VM_CR 0xc0010114 +#define MSR_VM_IGNNE 0xc0010115 +#define MSR_VM_HSAVE_PA 0xc0010117 + +#endif /* _UAPI_ASM_X86_MSR_INDEX_H */ -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 4/7] x86: put msr-index.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (4 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/x86/include/asm/msr-index.h | 694 +-------------------------------- arch/x86/include/uapi/asm/msr-index.h | 698 ++++++++++++++++++++++++++++++++++ 2 files changed, 699 insertions(+), 693 deletions(-) create mode 100644 arch/x86/include/uapi/asm/msr-index.h diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 710273c617b8..1baa0628da74 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -1,698 +1,6 @@ #ifndef _ASM_X86_MSR_INDEX_H #define _ASM_X86_MSR_INDEX_H -/* - * CPU model specific register (MSR) numbers. - * - * Do not add new entries to this file unless the definitions are shared - * between multiple compilation units. - */ - -/* x86-64 specific MSRs */ -#define MSR_EFER 0xc0000080 /* extended feature register */ -#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ -#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ -#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ -#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ -#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ -#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ -#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ -#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ - -/* EFER bits: */ -#define _EFER_SCE 0 /* SYSCALL/SYSRET */ -#define _EFER_LME 8 /* Long mode enable */ -#define _EFER_LMA 10 /* Long mode active (read-only) */ -#define _EFER_NX 11 /* No execute enable */ -#define _EFER_SVME 12 /* Enable virtualization */ -#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ -#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ - -#define EFER_SCE (1<<_EFER_SCE) -#define EFER_LME (1<<_EFER_LME) -#define EFER_LMA (1<<_EFER_LMA) -#define EFER_NX (1<<_EFER_NX) -#define EFER_SVME (1<<_EFER_SVME) -#define EFER_LMSLE (1<<_EFER_LMSLE) -#define EFER_FFXSR (1<<_EFER_FFXSR) - -/* Intel MSRs. Some also available on other CPUs */ - -#define MSR_PPIN_CTL 0x0000004e -#define MSR_PPIN 0x0000004f - -#define MSR_IA32_PERFCTR0 0x000000c1 -#define MSR_IA32_PERFCTR1 0x000000c2 -#define MSR_FSB_FREQ 0x000000cd -#define MSR_PLATFORM_INFO 0x000000ce - -#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 -#define NHM_C3_AUTO_DEMOTE (1UL << 25) -#define NHM_C1_AUTO_DEMOTE (1UL << 26) -#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) -#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) -#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) - -#define MSR_MTRRcap 0x000000fe -#define MSR_IA32_BBL_CR_CTL 0x00000119 -#define MSR_IA32_BBL_CR_CTL3 0x0000011e - -#define MSR_IA32_SYSENTER_CS 0x00000174 -#define MSR_IA32_SYSENTER_ESP 0x00000175 -#define MSR_IA32_SYSENTER_EIP 0x00000176 - -#define MSR_IA32_MCG_CAP 0x00000179 -#define MSR_IA32_MCG_STATUS 0x0000017a -#define MSR_IA32_MCG_CTL 0x0000017b -#define MSR_IA32_MCG_EXT_CTL 0x000004d0 - -#define MSR_OFFCORE_RSP_0 0x000001a6 -#define MSR_OFFCORE_RSP_1 0x000001a7 -#define MSR_TURBO_RATIO_LIMIT 0x000001ad -#define MSR_TURBO_RATIO_LIMIT1 0x000001ae -#define MSR_TURBO_RATIO_LIMIT2 0x000001af - -#define MSR_LBR_SELECT 0x000001c8 -#define MSR_LBR_TOS 0x000001c9 -#define MSR_LBR_NHM_FROM 0x00000680 -#define MSR_LBR_NHM_TO 0x000006c0 -#define MSR_LBR_CORE_FROM 0x00000040 -#define MSR_LBR_CORE_TO 0x00000060 - -#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ -#define LBR_INFO_MISPRED BIT_ULL(63) -#define LBR_INFO_IN_TX BIT_ULL(62) -#define LBR_INFO_ABORT BIT_ULL(61) -#define LBR_INFO_CYCLES 0xffff - -#define MSR_IA32_PEBS_ENABLE 0x000003f1 -#define MSR_IA32_DS_AREA 0x00000600 -#define MSR_IA32_PERF_CAPABILITIES 0x00000345 -#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 - -#define MSR_IA32_RTIT_CTL 0x00000570 -#define MSR_IA32_RTIT_STATUS 0x00000571 -#define MSR_IA32_RTIT_ADDR0_A 0x00000580 -#define MSR_IA32_RTIT_ADDR0_B 0x00000581 -#define MSR_IA32_RTIT_ADDR1_A 0x00000582 -#define MSR_IA32_RTIT_ADDR1_B 0x00000583 -#define MSR_IA32_RTIT_ADDR2_A 0x00000584 -#define MSR_IA32_RTIT_ADDR2_B 0x00000585 -#define MSR_IA32_RTIT_ADDR3_A 0x00000586 -#define MSR_IA32_RTIT_ADDR3_B 0x00000587 -#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 -#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 -#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 - -#define MSR_MTRRfix64K_00000 0x00000250 -#define MSR_MTRRfix16K_80000 0x00000258 -#define MSR_MTRRfix16K_A0000 0x00000259 -#define MSR_MTRRfix4K_C0000 0x00000268 -#define MSR_MTRRfix4K_C8000 0x00000269 -#define MSR_MTRRfix4K_D0000 0x0000026a -#define MSR_MTRRfix4K_D8000 0x0000026b -#define MSR_MTRRfix4K_E0000 0x0000026c -#define MSR_MTRRfix4K_E8000 0x0000026d -#define MSR_MTRRfix4K_F0000 0x0000026e -#define MSR_MTRRfix4K_F8000 0x0000026f -#define MSR_MTRRdefType 0x000002ff - -#define MSR_IA32_CR_PAT 0x00000277 - -#define MSR_IA32_DEBUGCTLMSR 0x000001d9 -#define MSR_IA32_LASTBRANCHFROMIP 0x000001db -#define MSR_IA32_LASTBRANCHTOIP 0x000001dc -#define MSR_IA32_LASTINTFROMIP 0x000001dd -#define MSR_IA32_LASTINTTOIP 0x000001de - -/* DEBUGCTLMSR bits (others vary by model): */ -#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ -#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ -#define DEBUGCTLMSR_TR (1UL << 6) -#define DEBUGCTLMSR_BTS (1UL << 7) -#define DEBUGCTLMSR_BTINT (1UL << 8) -#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) -#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) -#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) - -#define MSR_PEBS_FRONTEND 0x000003f7 - -#define MSR_IA32_POWER_CTL 0x000001fc - -#define MSR_IA32_MC0_CTL 0x00000400 -#define MSR_IA32_MC0_STATUS 0x00000401 -#define MSR_IA32_MC0_ADDR 0x00000402 -#define MSR_IA32_MC0_MISC 0x00000403 - -/* C-state Residency Counters */ -#define MSR_PKG_C3_RESIDENCY 0x000003f8 -#define MSR_PKG_C6_RESIDENCY 0x000003f9 -#define MSR_PKG_C7_RESIDENCY 0x000003fa -#define MSR_CORE_C3_RESIDENCY 0x000003fc -#define MSR_CORE_C6_RESIDENCY 0x000003fd -#define MSR_CORE_C7_RESIDENCY 0x000003fe -#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff -#define MSR_PKG_C2_RESIDENCY 0x0000060d -#define MSR_PKG_C8_RESIDENCY 0x00000630 -#define MSR_PKG_C9_RESIDENCY 0x00000631 -#define MSR_PKG_C10_RESIDENCY 0x00000632 - -/* Interrupt Response Limit */ -#define MSR_PKGC3_IRTL 0x0000060a -#define MSR_PKGC6_IRTL 0x0000060b -#define MSR_PKGC7_IRTL 0x0000060c -#define MSR_PKGC8_IRTL 0x00000633 -#define MSR_PKGC9_IRTL 0x00000634 -#define MSR_PKGC10_IRTL 0x00000635 - -/* Run Time Average Power Limiting (RAPL) Interface */ - -#define MSR_RAPL_POWER_UNIT 0x00000606 - -#define MSR_PKG_POWER_LIMIT 0x00000610 -#define MSR_PKG_ENERGY_STATUS 0x00000611 -#define MSR_PKG_PERF_STATUS 0x00000613 -#define MSR_PKG_POWER_INFO 0x00000614 - -#define MSR_DRAM_POWER_LIMIT 0x00000618 -#define MSR_DRAM_ENERGY_STATUS 0x00000619 -#define MSR_DRAM_PERF_STATUS 0x0000061b -#define MSR_DRAM_POWER_INFO 0x0000061c - -#define MSR_PP0_POWER_LIMIT 0x00000638 -#define MSR_PP0_ENERGY_STATUS 0x00000639 -#define MSR_PP0_POLICY 0x0000063a -#define MSR_PP0_PERF_STATUS 0x0000063b - -#define MSR_PP1_POWER_LIMIT 0x00000640 -#define MSR_PP1_ENERGY_STATUS 0x00000641 -#define MSR_PP1_POLICY 0x00000642 - -/* Config TDP MSRs */ -#define MSR_CONFIG_TDP_NOMINAL 0x00000648 -#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 -#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A -#define MSR_CONFIG_TDP_CONTROL 0x0000064B -#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C - -#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D - -#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 -#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 -#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A -#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B - -#define MSR_CORE_C1_RES 0x00000660 - -#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 -#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 - -#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 -#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 -#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 - -/* Hardware P state interface */ -#define MSR_PPERF 0x0000064e -#define MSR_PERF_LIMIT_REASONS 0x0000064f -#define MSR_PM_ENABLE 0x00000770 -#define MSR_HWP_CAPABILITIES 0x00000771 -#define MSR_HWP_REQUEST_PKG 0x00000772 -#define MSR_HWP_INTERRUPT 0x00000773 -#define MSR_HWP_REQUEST 0x00000774 -#define MSR_HWP_STATUS 0x00000777 - -/* CPUID.6.EAX */ -#define HWP_BASE_BIT (1<<7) -#define HWP_NOTIFICATIONS_BIT (1<<8) -#define HWP_ACTIVITY_WINDOW_BIT (1<<9) -#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) -#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) - -/* IA32_HWP_CAPABILITIES */ -#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) -#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) -#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) -#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) - -/* IA32_HWP_REQUEST */ -#define HWP_MIN_PERF(x) (x & 0xff) -#define HWP_MAX_PERF(x) ((x & 0xff) << 8) -#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) -#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) -#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) -#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) - -/* IA32_HWP_STATUS */ -#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) - -/* IA32_HWP_INTERRUPT */ -#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) - -#define MSR_AMD64_MC0_MASK 0xc0010044 - -#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) -#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) -#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) -#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) - -#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) - -/* These are consecutive and not in the normal 4er MCE bank block */ -#define MSR_IA32_MC0_CTL2 0x00000280 -#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) - -#define MSR_P6_PERFCTR0 0x000000c1 -#define MSR_P6_PERFCTR1 0x000000c2 -#define MSR_P6_EVNTSEL0 0x00000186 -#define MSR_P6_EVNTSEL1 0x00000187 - -#define MSR_KNC_PERFCTR0 0x00000020 -#define MSR_KNC_PERFCTR1 0x00000021 -#define MSR_KNC_EVNTSEL0 0x00000028 -#define MSR_KNC_EVNTSEL1 0x00000029 - -/* Alternative perfctr range with full access. */ -#define MSR_IA32_PMC0 0x000004c1 - -/* AMD64 MSRs. Not complete. See the architecture manual for a more - complete list. */ - -#define MSR_AMD64_PATCH_LEVEL 0x0000008b -#define MSR_AMD64_TSC_RATIO 0xc0000104 -#define MSR_AMD64_NB_CFG 0xc001001f -#define MSR_AMD64_PATCH_LOADER 0xc0010020 -#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 -#define MSR_AMD64_OSVW_STATUS 0xc0010141 -#define MSR_AMD64_LS_CFG 0xc0011020 -#define MSR_AMD64_DC_CFG 0xc0011022 -#define MSR_AMD64_BU_CFG2 0xc001102a -#define MSR_AMD64_IBSFETCHCTL 0xc0011030 -#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 -#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 -#define MSR_AMD64_IBSFETCH_REG_COUNT 3 -#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) -#define MSR_AMD64_IBSOPCTL 0xc0011033 -#define MSR_AMD64_IBSOPRIP 0xc0011034 -#define MSR_AMD64_IBSOPDATA 0xc0011035 -#define MSR_AMD64_IBSOPDATA2 0xc0011036 -#define MSR_AMD64_IBSOPDATA3 0xc0011037 -#define MSR_AMD64_IBSDCLINAD 0xc0011038 -#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 -#define MSR_AMD64_IBSOP_REG_COUNT 7 -#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) -#define MSR_AMD64_IBSCTL 0xc001103a -#define MSR_AMD64_IBSBRTARGET 0xc001103b -#define MSR_AMD64_IBSOPDATA4 0xc001103d -#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ - -/* Fam 17h MSRs */ -#define MSR_F17H_IRPERF 0xc00000e9 - -/* Fam 16h MSRs */ -#define MSR_F16H_L2I_PERF_CTL 0xc0010230 -#define MSR_F16H_L2I_PERF_CTR 0xc0010231 -#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 -#define MSR_F16H_DR2_ADDR_MASK 0xc001101a -#define MSR_F16H_DR3_ADDR_MASK 0xc001101b -#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 - -/* Fam 15h MSRs */ -#define MSR_F15H_PERF_CTL 0xc0010200 -#define MSR_F15H_PERF_CTR 0xc0010201 -#define MSR_F15H_NB_PERF_CTL 0xc0010240 -#define MSR_F15H_NB_PERF_CTR 0xc0010241 -#define MSR_F15H_PTSC 0xc0010280 -#define MSR_F15H_IC_CFG 0xc0011021 - -/* Fam 10h MSRs */ -#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 -#define FAM10H_MMIO_CONF_ENABLE (1<<0) -#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf -#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 -#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL -#define FAM10H_MMIO_CONF_BASE_SHIFT 20 -#define MSR_FAM10H_NODE_ID 0xc001100c - -/* K8 MSRs */ -#define MSR_K8_TOP_MEM1 0xc001001a -#define MSR_K8_TOP_MEM2 0xc001001d -#define MSR_K8_SYSCFG 0xc0010010 -#define MSR_K8_INT_PENDING_MSG 0xc0010055 -/* C1E active bits in int pending message */ -#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 -#define MSR_K8_TSEG_ADDR 0xc0010112 -#define MSR_K8_TSEG_MASK 0xc0010113 -#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ -#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ -#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ - -/* K7 MSRs */ -#define MSR_K7_EVNTSEL0 0xc0010000 -#define MSR_K7_PERFCTR0 0xc0010004 -#define MSR_K7_EVNTSEL1 0xc0010001 -#define MSR_K7_PERFCTR1 0xc0010005 -#define MSR_K7_EVNTSEL2 0xc0010002 -#define MSR_K7_PERFCTR2 0xc0010006 -#define MSR_K7_EVNTSEL3 0xc0010003 -#define MSR_K7_PERFCTR3 0xc0010007 -#define MSR_K7_CLK_CTL 0xc001001b -#define MSR_K7_HWCR 0xc0010015 -#define MSR_K7_FID_VID_CTL 0xc0010041 -#define MSR_K7_FID_VID_STATUS 0xc0010042 - -/* K6 MSRs */ -#define MSR_K6_WHCR 0xc0000082 -#define MSR_K6_UWCCR 0xc0000085 -#define MSR_K6_EPMR 0xc0000086 -#define MSR_K6_PSOR 0xc0000087 -#define MSR_K6_PFIR 0xc0000088 - -/* Centaur-Hauls/IDT defined MSRs. */ -#define MSR_IDT_FCR1 0x00000107 -#define MSR_IDT_FCR2 0x00000108 -#define MSR_IDT_FCR3 0x00000109 -#define MSR_IDT_FCR4 0x0000010a - -#define MSR_IDT_MCR0 0x00000110 -#define MSR_IDT_MCR1 0x00000111 -#define MSR_IDT_MCR2 0x00000112 -#define MSR_IDT_MCR3 0x00000113 -#define MSR_IDT_MCR4 0x00000114 -#define MSR_IDT_MCR5 0x00000115 -#define MSR_IDT_MCR6 0x00000116 -#define MSR_IDT_MCR7 0x00000117 -#define MSR_IDT_MCR_CTRL 0x00000120 - -/* VIA Cyrix defined MSRs*/ -#define MSR_VIA_FCR 0x00001107 -#define MSR_VIA_LONGHAUL 0x0000110a -#define MSR_VIA_RNG 0x0000110b -#define MSR_VIA_BCR2 0x00001147 - -/* Transmeta defined MSRs */ -#define MSR_TMTA_LONGRUN_CTRL 0x80868010 -#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 -#define MSR_TMTA_LRTI_READOUT 0x80868018 -#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a - -/* Intel defined MSRs. */ -#define MSR_IA32_P5_MC_ADDR 0x00000000 -#define MSR_IA32_P5_MC_TYPE 0x00000001 -#define MSR_IA32_TSC 0x00000010 -#define MSR_IA32_PLATFORM_ID 0x00000017 -#define MSR_IA32_EBL_CR_POWERON 0x0000002a -#define MSR_EBC_FREQUENCY_ID 0x0000002c -#define MSR_SMI_COUNT 0x00000034 -#define MSR_IA32_FEATURE_CONTROL 0x0000003a -#define MSR_IA32_TSC_ADJUST 0x0000003b -#define MSR_IA32_BNDCFGS 0x00000d90 - -#define MSR_IA32_XSS 0x00000da0 - -#define FEATURE_CONTROL_LOCKED (1<<0) -#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) -#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) -#define FEATURE_CONTROL_LMCE (1<<20) - -#define MSR_IA32_APICBASE 0x0000001b -#define MSR_IA32_APICBASE_BSP (1<<8) -#define MSR_IA32_APICBASE_ENABLE (1<<11) -#define MSR_IA32_APICBASE_BASE (0xfffff<<12) - -#define MSR_IA32_TSCDEADLINE 0x000006e0 - -#define MSR_IA32_UCODE_WRITE 0x00000079 -#define MSR_IA32_UCODE_REV 0x0000008b - -#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b -#define MSR_IA32_SMBASE 0x0000009e - -#define MSR_IA32_PERF_STATUS 0x00000198 -#define MSR_IA32_PERF_CTL 0x00000199 -#define INTEL_PERF_CTL_MASK 0xffff -#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 -#define MSR_AMD_PERF_STATUS 0xc0010063 -#define MSR_AMD_PERF_CTL 0xc0010062 - -#define MSR_IA32_MPERF 0x000000e7 -#define MSR_IA32_APERF 0x000000e8 - -#define MSR_IA32_THERM_CONTROL 0x0000019a -#define MSR_IA32_THERM_INTERRUPT 0x0000019b - -#define THERM_INT_HIGH_ENABLE (1 << 0) -#define THERM_INT_LOW_ENABLE (1 << 1) -#define THERM_INT_PLN_ENABLE (1 << 24) - -#define MSR_IA32_THERM_STATUS 0x0000019c - -#define THERM_STATUS_PROCHOT (1 << 0) -#define THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_THERM2_CTL 0x0000019d - -#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) - -#define MSR_IA32_MISC_ENABLE 0x000001a0 - -#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 - -#define MSR_MISC_PWR_MGMT 0x000001aa - -#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 -#define ENERGY_PERF_BIAS_PERFORMANCE 0 -#define ENERGY_PERF_BIAS_NORMAL 6 -#define ENERGY_PERF_BIAS_POWERSAVE 15 - -#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 - -#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) -#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 - -#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) -#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) -#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) - -/* Thermal Thresholds Support */ -#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) -#define THERM_SHIFT_THRESHOLD0 8 -#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) -#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) -#define THERM_SHIFT_THRESHOLD1 16 -#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) -#define THERM_STATUS_THRESHOLD0 (1 << 6) -#define THERM_LOG_THRESHOLD0 (1 << 7) -#define THERM_STATUS_THRESHOLD1 (1 << 8) -#define THERM_LOG_THRESHOLD1 (1 << 9) - -/* MISC_ENABLE bits: architectural */ -#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 -#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) -#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 -#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) -#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 -#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) -#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 -#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 -#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) - -/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ -#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 -#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) -#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 -#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) -#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 -#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) - -#define MSR_IA32_TSC_DEADLINE 0x000006E0 - -/* P4/Xeon+ specific */ -#define MSR_IA32_MCG_EAX 0x00000180 -#define MSR_IA32_MCG_EBX 0x00000181 -#define MSR_IA32_MCG_ECX 0x00000182 -#define MSR_IA32_MCG_EDX 0x00000183 -#define MSR_IA32_MCG_ESI 0x00000184 -#define MSR_IA32_MCG_EDI 0x00000185 -#define MSR_IA32_MCG_EBP 0x00000186 -#define MSR_IA32_MCG_ESP 0x00000187 -#define MSR_IA32_MCG_EFLAGS 0x00000188 -#define MSR_IA32_MCG_EIP 0x00000189 -#define MSR_IA32_MCG_RESERVED 0x0000018a - -/* Pentium IV performance counter MSRs */ -#define MSR_P4_BPU_PERFCTR0 0x00000300 -#define MSR_P4_BPU_PERFCTR1 0x00000301 -#define MSR_P4_BPU_PERFCTR2 0x00000302 -#define MSR_P4_BPU_PERFCTR3 0x00000303 -#define MSR_P4_MS_PERFCTR0 0x00000304 -#define MSR_P4_MS_PERFCTR1 0x00000305 -#define MSR_P4_MS_PERFCTR2 0x00000306 -#define MSR_P4_MS_PERFCTR3 0x00000307 -#define MSR_P4_FLAME_PERFCTR0 0x00000308 -#define MSR_P4_FLAME_PERFCTR1 0x00000309 -#define MSR_P4_FLAME_PERFCTR2 0x0000030a -#define MSR_P4_FLAME_PERFCTR3 0x0000030b -#define MSR_P4_IQ_PERFCTR0 0x0000030c -#define MSR_P4_IQ_PERFCTR1 0x0000030d -#define MSR_P4_IQ_PERFCTR2 0x0000030e -#define MSR_P4_IQ_PERFCTR3 0x0000030f -#define MSR_P4_IQ_PERFCTR4 0x00000310 -#define MSR_P4_IQ_PERFCTR5 0x00000311 -#define MSR_P4_BPU_CCCR0 0x00000360 -#define MSR_P4_BPU_CCCR1 0x00000361 -#define MSR_P4_BPU_CCCR2 0x00000362 -#define MSR_P4_BPU_CCCR3 0x00000363 -#define MSR_P4_MS_CCCR0 0x00000364 -#define MSR_P4_MS_CCCR1 0x00000365 -#define MSR_P4_MS_CCCR2 0x00000366 -#define MSR_P4_MS_CCCR3 0x00000367 -#define MSR_P4_FLAME_CCCR0 0x00000368 -#define MSR_P4_FLAME_CCCR1 0x00000369 -#define MSR_P4_FLAME_CCCR2 0x0000036a -#define MSR_P4_FLAME_CCCR3 0x0000036b -#define MSR_P4_IQ_CCCR0 0x0000036c -#define MSR_P4_IQ_CCCR1 0x0000036d -#define MSR_P4_IQ_CCCR2 0x0000036e -#define MSR_P4_IQ_CCCR3 0x0000036f -#define MSR_P4_IQ_CCCR4 0x00000370 -#define MSR_P4_IQ_CCCR5 0x00000371 -#define MSR_P4_ALF_ESCR0 0x000003ca -#define MSR_P4_ALF_ESCR1 0x000003cb -#define MSR_P4_BPU_ESCR0 0x000003b2 -#define MSR_P4_BPU_ESCR1 0x000003b3 -#define MSR_P4_BSU_ESCR0 0x000003a0 -#define MSR_P4_BSU_ESCR1 0x000003a1 -#define MSR_P4_CRU_ESCR0 0x000003b8 -#define MSR_P4_CRU_ESCR1 0x000003b9 -#define MSR_P4_CRU_ESCR2 0x000003cc -#define MSR_P4_CRU_ESCR3 0x000003cd -#define MSR_P4_CRU_ESCR4 0x000003e0 -#define MSR_P4_CRU_ESCR5 0x000003e1 -#define MSR_P4_DAC_ESCR0 0x000003a8 -#define MSR_P4_DAC_ESCR1 0x000003a9 -#define MSR_P4_FIRM_ESCR0 0x000003a4 -#define MSR_P4_FIRM_ESCR1 0x000003a5 -#define MSR_P4_FLAME_ESCR0 0x000003a6 -#define MSR_P4_FLAME_ESCR1 0x000003a7 -#define MSR_P4_FSB_ESCR0 0x000003a2 -#define MSR_P4_FSB_ESCR1 0x000003a3 -#define MSR_P4_IQ_ESCR0 0x000003ba -#define MSR_P4_IQ_ESCR1 0x000003bb -#define MSR_P4_IS_ESCR0 0x000003b4 -#define MSR_P4_IS_ESCR1 0x000003b5 -#define MSR_P4_ITLB_ESCR0 0x000003b6 -#define MSR_P4_ITLB_ESCR1 0x000003b7 -#define MSR_P4_IX_ESCR0 0x000003c8 -#define MSR_P4_IX_ESCR1 0x000003c9 -#define MSR_P4_MOB_ESCR0 0x000003aa -#define MSR_P4_MOB_ESCR1 0x000003ab -#define MSR_P4_MS_ESCR0 0x000003c0 -#define MSR_P4_MS_ESCR1 0x000003c1 -#define MSR_P4_PMH_ESCR0 0x000003ac -#define MSR_P4_PMH_ESCR1 0x000003ad -#define MSR_P4_RAT_ESCR0 0x000003bc -#define MSR_P4_RAT_ESCR1 0x000003bd -#define MSR_P4_SAAT_ESCR0 0x000003ae -#define MSR_P4_SAAT_ESCR1 0x000003af -#define MSR_P4_SSU_ESCR0 0x000003be -#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ - -#define MSR_P4_TBPU_ESCR0 0x000003c2 -#define MSR_P4_TBPU_ESCR1 0x000003c3 -#define MSR_P4_TC_ESCR0 0x000003c4 -#define MSR_P4_TC_ESCR1 0x000003c5 -#define MSR_P4_U2L_ESCR0 0x000003b0 -#define MSR_P4_U2L_ESCR1 0x000003b1 - -#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 - -/* Intel Core-based CPU performance counters */ -#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 -#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a -#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b -#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d -#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e -#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f -#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 - -/* Geode defined MSRs */ -#define MSR_GEODE_BUSCONT_CONF0 0x00001900 - -/* Intel VT MSRs */ -#define MSR_IA32_VMX_BASIC 0x00000480 -#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 -#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 -#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 -#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 -#define MSR_IA32_VMX_MISC 0x00000485 -#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 -#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 -#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 -#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 -#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a -#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b -#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c -#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d -#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e -#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f -#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 -#define MSR_IA32_VMX_VMFUNC 0x00000491 - -/* VMX_BASIC bits and bitmasks */ -#define VMX_BASIC_VMCS_SIZE_SHIFT 32 -#define VMX_BASIC_TRUE_CTLS (1ULL << 55) -#define VMX_BASIC_64 0x0001000000000000LLU -#define VMX_BASIC_MEM_TYPE_SHIFT 50 -#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU -#define VMX_BASIC_MEM_TYPE_WB 6LLU -#define VMX_BASIC_INOUT 0x0040000000000000LLU - -/* MSR_IA32_VMX_MISC bits */ -#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) -#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F -/* AMD-V MSRs */ - -#define MSR_VM_CR 0xc0010114 -#define MSR_VM_IGNNE 0xc0010115 -#define MSR_VM_HSAVE_PA 0xc0010117 +#include <uapi/asm/msr-index.h> #endif /* _ASM_X86_MSR_INDEX_H */ diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h new file mode 100644 index 000000000000..d097e832ee3c --- /dev/null +++ b/arch/x86/include/uapi/asm/msr-index.h @@ -0,0 +1,698 @@ +#ifndef _UAPI_ASM_X86_MSR_INDEX_H +#define _UAPI_ASM_X86_MSR_INDEX_H + +/* + * CPU model specific register (MSR) numbers. + * + * Do not add new entries to this file unless the definitions are shared + * between multiple compilation units. + */ + +/* x86-64 specific MSRs */ +#define MSR_EFER 0xc0000080 /* extended feature register */ +#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ +#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ +#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ +#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ +#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ +#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ +#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ +#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ + +/* EFER bits: */ +#define _EFER_SCE 0 /* SYSCALL/SYSRET */ +#define _EFER_LME 8 /* Long mode enable */ +#define _EFER_LMA 10 /* Long mode active (read-only) */ +#define _EFER_NX 11 /* No execute enable */ +#define _EFER_SVME 12 /* Enable virtualization */ +#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ +#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ + +#define EFER_SCE (1<<_EFER_SCE) +#define EFER_LME (1<<_EFER_LME) +#define EFER_LMA (1<<_EFER_LMA) +#define EFER_NX (1<<_EFER_NX) +#define EFER_SVME (1<<_EFER_SVME) +#define EFER_LMSLE (1<<_EFER_LMSLE) +#define EFER_FFXSR (1<<_EFER_FFXSR) + +/* Intel MSRs. Some also available on other CPUs */ + +#define MSR_PPIN_CTL 0x0000004e +#define MSR_PPIN 0x0000004f + +#define MSR_IA32_PERFCTR0 0x000000c1 +#define MSR_IA32_PERFCTR1 0x000000c2 +#define MSR_FSB_FREQ 0x000000cd +#define MSR_PLATFORM_INFO 0x000000ce + +#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 +#define NHM_C3_AUTO_DEMOTE (1UL << 25) +#define NHM_C1_AUTO_DEMOTE (1UL << 26) +#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) +#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) +#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) + +#define MSR_MTRRcap 0x000000fe +#define MSR_IA32_BBL_CR_CTL 0x00000119 +#define MSR_IA32_BBL_CR_CTL3 0x0000011e + +#define MSR_IA32_SYSENTER_CS 0x00000174 +#define MSR_IA32_SYSENTER_ESP 0x00000175 +#define MSR_IA32_SYSENTER_EIP 0x00000176 + +#define MSR_IA32_MCG_CAP 0x00000179 +#define MSR_IA32_MCG_STATUS 0x0000017a +#define MSR_IA32_MCG_CTL 0x0000017b +#define MSR_IA32_MCG_EXT_CTL 0x000004d0 + +#define MSR_OFFCORE_RSP_0 0x000001a6 +#define MSR_OFFCORE_RSP_1 0x000001a7 +#define MSR_TURBO_RATIO_LIMIT 0x000001ad +#define MSR_TURBO_RATIO_LIMIT1 0x000001ae +#define MSR_TURBO_RATIO_LIMIT2 0x000001af + +#define MSR_LBR_SELECT 0x000001c8 +#define MSR_LBR_TOS 0x000001c9 +#define MSR_LBR_NHM_FROM 0x00000680 +#define MSR_LBR_NHM_TO 0x000006c0 +#define MSR_LBR_CORE_FROM 0x00000040 +#define MSR_LBR_CORE_TO 0x00000060 + +#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ +#define LBR_INFO_MISPRED BIT_ULL(63) +#define LBR_INFO_IN_TX BIT_ULL(62) +#define LBR_INFO_ABORT BIT_ULL(61) +#define LBR_INFO_CYCLES 0xffff + +#define MSR_IA32_PEBS_ENABLE 0x000003f1 +#define MSR_IA32_DS_AREA 0x00000600 +#define MSR_IA32_PERF_CAPABILITIES 0x00000345 +#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 + +#define MSR_IA32_RTIT_CTL 0x00000570 +#define MSR_IA32_RTIT_STATUS 0x00000571 +#define MSR_IA32_RTIT_ADDR0_A 0x00000580 +#define MSR_IA32_RTIT_ADDR0_B 0x00000581 +#define MSR_IA32_RTIT_ADDR1_A 0x00000582 +#define MSR_IA32_RTIT_ADDR1_B 0x00000583 +#define MSR_IA32_RTIT_ADDR2_A 0x00000584 +#define MSR_IA32_RTIT_ADDR2_B 0x00000585 +#define MSR_IA32_RTIT_ADDR3_A 0x00000586 +#define MSR_IA32_RTIT_ADDR3_B 0x00000587 +#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 +#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 +#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 + +#define MSR_MTRRfix64K_00000 0x00000250 +#define MSR_MTRRfix16K_80000 0x00000258 +#define MSR_MTRRfix16K_A0000 0x00000259 +#define MSR_MTRRfix4K_C0000 0x00000268 +#define MSR_MTRRfix4K_C8000 0x00000269 +#define MSR_MTRRfix4K_D0000 0x0000026a +#define MSR_MTRRfix4K_D8000 0x0000026b +#define MSR_MTRRfix4K_E0000 0x0000026c +#define MSR_MTRRfix4K_E8000 0x0000026d +#define MSR_MTRRfix4K_F0000 0x0000026e +#define MSR_MTRRfix4K_F8000 0x0000026f +#define MSR_MTRRdefType 0x000002ff + +#define MSR_IA32_CR_PAT 0x00000277 + +#define MSR_IA32_DEBUGCTLMSR 0x000001d9 +#define MSR_IA32_LASTBRANCHFROMIP 0x000001db +#define MSR_IA32_LASTBRANCHTOIP 0x000001dc +#define MSR_IA32_LASTINTFROMIP 0x000001dd +#define MSR_IA32_LASTINTTOIP 0x000001de + +/* DEBUGCTLMSR bits (others vary by model): */ +#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ +#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ +#define DEBUGCTLMSR_TR (1UL << 6) +#define DEBUGCTLMSR_BTS (1UL << 7) +#define DEBUGCTLMSR_BTINT (1UL << 8) +#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) +#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) +#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) + +#define MSR_PEBS_FRONTEND 0x000003f7 + +#define MSR_IA32_POWER_CTL 0x000001fc + +#define MSR_IA32_MC0_CTL 0x00000400 +#define MSR_IA32_MC0_STATUS 0x00000401 +#define MSR_IA32_MC0_ADDR 0x00000402 +#define MSR_IA32_MC0_MISC 0x00000403 + +/* C-state Residency Counters */ +#define MSR_PKG_C3_RESIDENCY 0x000003f8 +#define MSR_PKG_C6_RESIDENCY 0x000003f9 +#define MSR_PKG_C7_RESIDENCY 0x000003fa +#define MSR_CORE_C3_RESIDENCY 0x000003fc +#define MSR_CORE_C6_RESIDENCY 0x000003fd +#define MSR_CORE_C7_RESIDENCY 0x000003fe +#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff +#define MSR_PKG_C2_RESIDENCY 0x0000060d +#define MSR_PKG_C8_RESIDENCY 0x00000630 +#define MSR_PKG_C9_RESIDENCY 0x00000631 +#define MSR_PKG_C10_RESIDENCY 0x00000632 + +/* Interrupt Response Limit */ +#define MSR_PKGC3_IRTL 0x0000060a +#define MSR_PKGC6_IRTL 0x0000060b +#define MSR_PKGC7_IRTL 0x0000060c +#define MSR_PKGC8_IRTL 0x00000633 +#define MSR_PKGC9_IRTL 0x00000634 +#define MSR_PKGC10_IRTL 0x00000635 + +/* Run Time Average Power Limiting (RAPL) Interface */ + +#define MSR_RAPL_POWER_UNIT 0x00000606 + +#define MSR_PKG_POWER_LIMIT 0x00000610 +#define MSR_PKG_ENERGY_STATUS 0x00000611 +#define MSR_PKG_PERF_STATUS 0x00000613 +#define MSR_PKG_POWER_INFO 0x00000614 + +#define MSR_DRAM_POWER_LIMIT 0x00000618 +#define MSR_DRAM_ENERGY_STATUS 0x00000619 +#define MSR_DRAM_PERF_STATUS 0x0000061b +#define MSR_DRAM_POWER_INFO 0x0000061c + +#define MSR_PP0_POWER_LIMIT 0x00000638 +#define MSR_PP0_ENERGY_STATUS 0x00000639 +#define MSR_PP0_POLICY 0x0000063a +#define MSR_PP0_PERF_STATUS 0x0000063b + +#define MSR_PP1_POWER_LIMIT 0x00000640 +#define MSR_PP1_ENERGY_STATUS 0x00000641 +#define MSR_PP1_POLICY 0x00000642 + +/* Config TDP MSRs */ +#define MSR_CONFIG_TDP_NOMINAL 0x00000648 +#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 +#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A +#define MSR_CONFIG_TDP_CONTROL 0x0000064B +#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C + +#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D + +#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 +#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 +#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A +#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B + +#define MSR_CORE_C1_RES 0x00000660 + +#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 +#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 + +#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 +#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 +#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 + +/* Hardware P state interface */ +#define MSR_PPERF 0x0000064e +#define MSR_PERF_LIMIT_REASONS 0x0000064f +#define MSR_PM_ENABLE 0x00000770 +#define MSR_HWP_CAPABILITIES 0x00000771 +#define MSR_HWP_REQUEST_PKG 0x00000772 +#define MSR_HWP_INTERRUPT 0x00000773 +#define MSR_HWP_REQUEST 0x00000774 +#define MSR_HWP_STATUS 0x00000777 + +/* CPUID.6.EAX */ +#define HWP_BASE_BIT (1<<7) +#define HWP_NOTIFICATIONS_BIT (1<<8) +#define HWP_ACTIVITY_WINDOW_BIT (1<<9) +#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) +#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) + +/* IA32_HWP_CAPABILITIES */ +#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) +#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) +#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) +#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) + +/* IA32_HWP_REQUEST */ +#define HWP_MIN_PERF(x) (x & 0xff) +#define HWP_MAX_PERF(x) ((x & 0xff) << 8) +#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) +#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) +#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) +#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) + +/* IA32_HWP_STATUS */ +#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) + +/* IA32_HWP_INTERRUPT */ +#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) + +#define MSR_AMD64_MC0_MASK 0xc0010044 + +#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) +#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) +#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) +#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) + +#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) + +/* These are consecutive and not in the normal 4er MCE bank block */ +#define MSR_IA32_MC0_CTL2 0x00000280 +#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) + +#define MSR_P6_PERFCTR0 0x000000c1 +#define MSR_P6_PERFCTR1 0x000000c2 +#define MSR_P6_EVNTSEL0 0x00000186 +#define MSR_P6_EVNTSEL1 0x00000187 + +#define MSR_KNC_PERFCTR0 0x00000020 +#define MSR_KNC_PERFCTR1 0x00000021 +#define MSR_KNC_EVNTSEL0 0x00000028 +#define MSR_KNC_EVNTSEL1 0x00000029 + +/* Alternative perfctr range with full access. */ +#define MSR_IA32_PMC0 0x000004c1 + +/* AMD64 MSRs. Not complete. See the architecture manual for a more + complete list. */ + +#define MSR_AMD64_PATCH_LEVEL 0x0000008b +#define MSR_AMD64_TSC_RATIO 0xc0000104 +#define MSR_AMD64_NB_CFG 0xc001001f +#define MSR_AMD64_PATCH_LOADER 0xc0010020 +#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 +#define MSR_AMD64_OSVW_STATUS 0xc0010141 +#define MSR_AMD64_LS_CFG 0xc0011020 +#define MSR_AMD64_DC_CFG 0xc0011022 +#define MSR_AMD64_BU_CFG2 0xc001102a +#define MSR_AMD64_IBSFETCHCTL 0xc0011030 +#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 +#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 +#define MSR_AMD64_IBSFETCH_REG_COUNT 3 +#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) +#define MSR_AMD64_IBSOPCTL 0xc0011033 +#define MSR_AMD64_IBSOPRIP 0xc0011034 +#define MSR_AMD64_IBSOPDATA 0xc0011035 +#define MSR_AMD64_IBSOPDATA2 0xc0011036 +#define MSR_AMD64_IBSOPDATA3 0xc0011037 +#define MSR_AMD64_IBSDCLINAD 0xc0011038 +#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 +#define MSR_AMD64_IBSOP_REG_COUNT 7 +#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) +#define MSR_AMD64_IBSCTL 0xc001103a +#define MSR_AMD64_IBSBRTARGET 0xc001103b +#define MSR_AMD64_IBSOPDATA4 0xc001103d +#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ + +/* Fam 17h MSRs */ +#define MSR_F17H_IRPERF 0xc00000e9 + +/* Fam 16h MSRs */ +#define MSR_F16H_L2I_PERF_CTL 0xc0010230 +#define MSR_F16H_L2I_PERF_CTR 0xc0010231 +#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 +#define MSR_F16H_DR2_ADDR_MASK 0xc001101a +#define MSR_F16H_DR3_ADDR_MASK 0xc001101b +#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 + +/* Fam 15h MSRs */ +#define MSR_F15H_PERF_CTL 0xc0010200 +#define MSR_F15H_PERF_CTR 0xc0010201 +#define MSR_F15H_NB_PERF_CTL 0xc0010240 +#define MSR_F15H_NB_PERF_CTR 0xc0010241 +#define MSR_F15H_PTSC 0xc0010280 +#define MSR_F15H_IC_CFG 0xc0011021 + +/* Fam 10h MSRs */ +#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 +#define FAM10H_MMIO_CONF_ENABLE (1<<0) +#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf +#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 +#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL +#define FAM10H_MMIO_CONF_BASE_SHIFT 20 +#define MSR_FAM10H_NODE_ID 0xc001100c + +/* K8 MSRs */ +#define MSR_K8_TOP_MEM1 0xc001001a +#define MSR_K8_TOP_MEM2 0xc001001d +#define MSR_K8_SYSCFG 0xc0010010 +#define MSR_K8_INT_PENDING_MSG 0xc0010055 +/* C1E active bits in int pending message */ +#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 +#define MSR_K8_TSEG_ADDR 0xc0010112 +#define MSR_K8_TSEG_MASK 0xc0010113 +#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ +#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ +#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ + +/* K7 MSRs */ +#define MSR_K7_EVNTSEL0 0xc0010000 +#define MSR_K7_PERFCTR0 0xc0010004 +#define MSR_K7_EVNTSEL1 0xc0010001 +#define MSR_K7_PERFCTR1 0xc0010005 +#define MSR_K7_EVNTSEL2 0xc0010002 +#define MSR_K7_PERFCTR2 0xc0010006 +#define MSR_K7_EVNTSEL3 0xc0010003 +#define MSR_K7_PERFCTR3 0xc0010007 +#define MSR_K7_CLK_CTL 0xc001001b +#define MSR_K7_HWCR 0xc0010015 +#define MSR_K7_FID_VID_CTL 0xc0010041 +#define MSR_K7_FID_VID_STATUS 0xc0010042 + +/* K6 MSRs */ +#define MSR_K6_WHCR 0xc0000082 +#define MSR_K6_UWCCR 0xc0000085 +#define MSR_K6_EPMR 0xc0000086 +#define MSR_K6_PSOR 0xc0000087 +#define MSR_K6_PFIR 0xc0000088 + +/* Centaur-Hauls/IDT defined MSRs. */ +#define MSR_IDT_FCR1 0x00000107 +#define MSR_IDT_FCR2 0x00000108 +#define MSR_IDT_FCR3 0x00000109 +#define MSR_IDT_FCR4 0x0000010a + +#define MSR_IDT_MCR0 0x00000110 +#define MSR_IDT_MCR1 0x00000111 +#define MSR_IDT_MCR2 0x00000112 +#define MSR_IDT_MCR3 0x00000113 +#define MSR_IDT_MCR4 0x00000114 +#define MSR_IDT_MCR5 0x00000115 +#define MSR_IDT_MCR6 0x00000116 +#define MSR_IDT_MCR7 0x00000117 +#define MSR_IDT_MCR_CTRL 0x00000120 + +/* VIA Cyrix defined MSRs*/ +#define MSR_VIA_FCR 0x00001107 +#define MSR_VIA_LONGHAUL 0x0000110a +#define MSR_VIA_RNG 0x0000110b +#define MSR_VIA_BCR2 0x00001147 + +/* Transmeta defined MSRs */ +#define MSR_TMTA_LONGRUN_CTRL 0x80868010 +#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 +#define MSR_TMTA_LRTI_READOUT 0x80868018 +#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a + +/* Intel defined MSRs. */ +#define MSR_IA32_P5_MC_ADDR 0x00000000 +#define MSR_IA32_P5_MC_TYPE 0x00000001 +#define MSR_IA32_TSC 0x00000010 +#define MSR_IA32_PLATFORM_ID 0x00000017 +#define MSR_IA32_EBL_CR_POWERON 0x0000002a +#define MSR_EBC_FREQUENCY_ID 0x0000002c +#define MSR_SMI_COUNT 0x00000034 +#define MSR_IA32_FEATURE_CONTROL 0x0000003a +#define MSR_IA32_TSC_ADJUST 0x0000003b +#define MSR_IA32_BNDCFGS 0x00000d90 + +#define MSR_IA32_XSS 0x00000da0 + +#define FEATURE_CONTROL_LOCKED (1<<0) +#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) +#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) +#define FEATURE_CONTROL_LMCE (1<<20) + +#define MSR_IA32_APICBASE 0x0000001b +#define MSR_IA32_APICBASE_BSP (1<<8) +#define MSR_IA32_APICBASE_ENABLE (1<<11) +#define MSR_IA32_APICBASE_BASE (0xfffff<<12) + +#define MSR_IA32_TSCDEADLINE 0x000006e0 + +#define MSR_IA32_UCODE_WRITE 0x00000079 +#define MSR_IA32_UCODE_REV 0x0000008b + +#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b +#define MSR_IA32_SMBASE 0x0000009e + +#define MSR_IA32_PERF_STATUS 0x00000198 +#define MSR_IA32_PERF_CTL 0x00000199 +#define INTEL_PERF_CTL_MASK 0xffff +#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 +#define MSR_AMD_PERF_STATUS 0xc0010063 +#define MSR_AMD_PERF_CTL 0xc0010062 + +#define MSR_IA32_MPERF 0x000000e7 +#define MSR_IA32_APERF 0x000000e8 + +#define MSR_IA32_THERM_CONTROL 0x0000019a +#define MSR_IA32_THERM_INTERRUPT 0x0000019b + +#define THERM_INT_HIGH_ENABLE (1 << 0) +#define THERM_INT_LOW_ENABLE (1 << 1) +#define THERM_INT_PLN_ENABLE (1 << 24) + +#define MSR_IA32_THERM_STATUS 0x0000019c + +#define THERM_STATUS_PROCHOT (1 << 0) +#define THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_THERM2_CTL 0x0000019d + +#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) + +#define MSR_IA32_MISC_ENABLE 0x000001a0 + +#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 + +#define MSR_MISC_PWR_MGMT 0x000001aa + +#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 +#define ENERGY_PERF_BIAS_PERFORMANCE 0 +#define ENERGY_PERF_BIAS_NORMAL 6 +#define ENERGY_PERF_BIAS_POWERSAVE 15 + +#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 + +#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) +#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 + +#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) +#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) +#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) + +/* Thermal Thresholds Support */ +#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) +#define THERM_SHIFT_THRESHOLD0 8 +#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) +#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) +#define THERM_SHIFT_THRESHOLD1 16 +#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) +#define THERM_STATUS_THRESHOLD0 (1 << 6) +#define THERM_LOG_THRESHOLD0 (1 << 7) +#define THERM_STATUS_THRESHOLD1 (1 << 8) +#define THERM_LOG_THRESHOLD1 (1 << 9) + +/* MISC_ENABLE bits: architectural */ +#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 +#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) +#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 +#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) +#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 +#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) +#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 +#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 +#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) + +/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ +#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 +#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) +#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 +#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) +#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 +#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) + +#define MSR_IA32_TSC_DEADLINE 0x000006E0 + +/* P4/Xeon+ specific */ +#define MSR_IA32_MCG_EAX 0x00000180 +#define MSR_IA32_MCG_EBX 0x00000181 +#define MSR_IA32_MCG_ECX 0x00000182 +#define MSR_IA32_MCG_EDX 0x00000183 +#define MSR_IA32_MCG_ESI 0x00000184 +#define MSR_IA32_MCG_EDI 0x00000185 +#define MSR_IA32_MCG_EBP 0x00000186 +#define MSR_IA32_MCG_ESP 0x00000187 +#define MSR_IA32_MCG_EFLAGS 0x00000188 +#define MSR_IA32_MCG_EIP 0x00000189 +#define MSR_IA32_MCG_RESERVED 0x0000018a + +/* Pentium IV performance counter MSRs */ +#define MSR_P4_BPU_PERFCTR0 0x00000300 +#define MSR_P4_BPU_PERFCTR1 0x00000301 +#define MSR_P4_BPU_PERFCTR2 0x00000302 +#define MSR_P4_BPU_PERFCTR3 0x00000303 +#define MSR_P4_MS_PERFCTR0 0x00000304 +#define MSR_P4_MS_PERFCTR1 0x00000305 +#define MSR_P4_MS_PERFCTR2 0x00000306 +#define MSR_P4_MS_PERFCTR3 0x00000307 +#define MSR_P4_FLAME_PERFCTR0 0x00000308 +#define MSR_P4_FLAME_PERFCTR1 0x00000309 +#define MSR_P4_FLAME_PERFCTR2 0x0000030a +#define MSR_P4_FLAME_PERFCTR3 0x0000030b +#define MSR_P4_IQ_PERFCTR0 0x0000030c +#define MSR_P4_IQ_PERFCTR1 0x0000030d +#define MSR_P4_IQ_PERFCTR2 0x0000030e +#define MSR_P4_IQ_PERFCTR3 0x0000030f +#define MSR_P4_IQ_PERFCTR4 0x00000310 +#define MSR_P4_IQ_PERFCTR5 0x00000311 +#define MSR_P4_BPU_CCCR0 0x00000360 +#define MSR_P4_BPU_CCCR1 0x00000361 +#define MSR_P4_BPU_CCCR2 0x00000362 +#define MSR_P4_BPU_CCCR3 0x00000363 +#define MSR_P4_MS_CCCR0 0x00000364 +#define MSR_P4_MS_CCCR1 0x00000365 +#define MSR_P4_MS_CCCR2 0x00000366 +#define MSR_P4_MS_CCCR3 0x00000367 +#define MSR_P4_FLAME_CCCR0 0x00000368 +#define MSR_P4_FLAME_CCCR1 0x00000369 +#define MSR_P4_FLAME_CCCR2 0x0000036a +#define MSR_P4_FLAME_CCCR3 0x0000036b +#define MSR_P4_IQ_CCCR0 0x0000036c +#define MSR_P4_IQ_CCCR1 0x0000036d +#define MSR_P4_IQ_CCCR2 0x0000036e +#define MSR_P4_IQ_CCCR3 0x0000036f +#define MSR_P4_IQ_CCCR4 0x00000370 +#define MSR_P4_IQ_CCCR5 0x00000371 +#define MSR_P4_ALF_ESCR0 0x000003ca +#define MSR_P4_ALF_ESCR1 0x000003cb +#define MSR_P4_BPU_ESCR0 0x000003b2 +#define MSR_P4_BPU_ESCR1 0x000003b3 +#define MSR_P4_BSU_ESCR0 0x000003a0 +#define MSR_P4_BSU_ESCR1 0x000003a1 +#define MSR_P4_CRU_ESCR0 0x000003b8 +#define MSR_P4_CRU_ESCR1 0x000003b9 +#define MSR_P4_CRU_ESCR2 0x000003cc +#define MSR_P4_CRU_ESCR3 0x000003cd +#define MSR_P4_CRU_ESCR4 0x000003e0 +#define MSR_P4_CRU_ESCR5 0x000003e1 +#define MSR_P4_DAC_ESCR0 0x000003a8 +#define MSR_P4_DAC_ESCR1 0x000003a9 +#define MSR_P4_FIRM_ESCR0 0x000003a4 +#define MSR_P4_FIRM_ESCR1 0x000003a5 +#define MSR_P4_FLAME_ESCR0 0x000003a6 +#define MSR_P4_FLAME_ESCR1 0x000003a7 +#define MSR_P4_FSB_ESCR0 0x000003a2 +#define MSR_P4_FSB_ESCR1 0x000003a3 +#define MSR_P4_IQ_ESCR0 0x000003ba +#define MSR_P4_IQ_ESCR1 0x000003bb +#define MSR_P4_IS_ESCR0 0x000003b4 +#define MSR_P4_IS_ESCR1 0x000003b5 +#define MSR_P4_ITLB_ESCR0 0x000003b6 +#define MSR_P4_ITLB_ESCR1 0x000003b7 +#define MSR_P4_IX_ESCR0 0x000003c8 +#define MSR_P4_IX_ESCR1 0x000003c9 +#define MSR_P4_MOB_ESCR0 0x000003aa +#define MSR_P4_MOB_ESCR1 0x000003ab +#define MSR_P4_MS_ESCR0 0x000003c0 +#define MSR_P4_MS_ESCR1 0x000003c1 +#define MSR_P4_PMH_ESCR0 0x000003ac +#define MSR_P4_PMH_ESCR1 0x000003ad +#define MSR_P4_RAT_ESCR0 0x000003bc +#define MSR_P4_RAT_ESCR1 0x000003bd +#define MSR_P4_SAAT_ESCR0 0x000003ae +#define MSR_P4_SAAT_ESCR1 0x000003af +#define MSR_P4_SSU_ESCR0 0x000003be +#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ + +#define MSR_P4_TBPU_ESCR0 0x000003c2 +#define MSR_P4_TBPU_ESCR1 0x000003c3 +#define MSR_P4_TC_ESCR0 0x000003c4 +#define MSR_P4_TC_ESCR1 0x000003c5 +#define MSR_P4_U2L_ESCR0 0x000003b0 +#define MSR_P4_U2L_ESCR1 0x000003b1 + +#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 + +/* Intel Core-based CPU performance counters */ +#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 +#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a +#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b +#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d +#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e +#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f +#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 + +/* Geode defined MSRs */ +#define MSR_GEODE_BUSCONT_CONF0 0x00001900 + +/* Intel VT MSRs */ +#define MSR_IA32_VMX_BASIC 0x00000480 +#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 +#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 +#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 +#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 +#define MSR_IA32_VMX_MISC 0x00000485 +#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 +#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 +#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 +#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 +#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a +#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b +#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c +#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d +#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e +#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f +#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 +#define MSR_IA32_VMX_VMFUNC 0x00000491 + +/* VMX_BASIC bits and bitmasks */ +#define VMX_BASIC_VMCS_SIZE_SHIFT 32 +#define VMX_BASIC_TRUE_CTLS (1ULL << 55) +#define VMX_BASIC_64 0x0001000000000000LLU +#define VMX_BASIC_MEM_TYPE_SHIFT 50 +#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU +#define VMX_BASIC_MEM_TYPE_WB 6LLU +#define VMX_BASIC_INOUT 0x0040000000000000LLU + +/* MSR_IA32_VMX_MISC bits */ +#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) +#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F +/* AMD-V MSRs */ + +#define MSR_VM_CR 0xc0010114 +#define MSR_VM_IGNNE 0xc0010115 +#define MSR_VM_HSAVE_PA 0xc0010117 + +#endif /* _UAPI_ASM_X86_MSR_INDEX_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: openrisc This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/x86/include/asm/msr-index.h | 694 +-------------------------------- arch/x86/include/uapi/asm/msr-index.h | 698 ++++++++++++++++++++++++++++++++++ 2 files changed, 699 insertions(+), 693 deletions(-) create mode 100644 arch/x86/include/uapi/asm/msr-index.h diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 710273c617b8..1baa0628da74 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -1,698 +1,6 @@ #ifndef _ASM_X86_MSR_INDEX_H #define _ASM_X86_MSR_INDEX_H -/* - * CPU model specific register (MSR) numbers. - * - * Do not add new entries to this file unless the definitions are shared - * between multiple compilation units. - */ - -/* x86-64 specific MSRs */ -#define MSR_EFER 0xc0000080 /* extended feature register */ -#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ -#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ -#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ -#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ -#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ -#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ -#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ -#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ - -/* EFER bits: */ -#define _EFER_SCE 0 /* SYSCALL/SYSRET */ -#define _EFER_LME 8 /* Long mode enable */ -#define _EFER_LMA 10 /* Long mode active (read-only) */ -#define _EFER_NX 11 /* No execute enable */ -#define _EFER_SVME 12 /* Enable virtualization */ -#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ -#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ - -#define EFER_SCE (1<<_EFER_SCE) -#define EFER_LME (1<<_EFER_LME) -#define EFER_LMA (1<<_EFER_LMA) -#define EFER_NX (1<<_EFER_NX) -#define EFER_SVME (1<<_EFER_SVME) -#define EFER_LMSLE (1<<_EFER_LMSLE) -#define EFER_FFXSR (1<<_EFER_FFXSR) - -/* Intel MSRs. Some also available on other CPUs */ - -#define MSR_PPIN_CTL 0x0000004e -#define MSR_PPIN 0x0000004f - -#define MSR_IA32_PERFCTR0 0x000000c1 -#define MSR_IA32_PERFCTR1 0x000000c2 -#define MSR_FSB_FREQ 0x000000cd -#define MSR_PLATFORM_INFO 0x000000ce - -#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 -#define NHM_C3_AUTO_DEMOTE (1UL << 25) -#define NHM_C1_AUTO_DEMOTE (1UL << 26) -#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) -#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) -#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) - -#define MSR_MTRRcap 0x000000fe -#define MSR_IA32_BBL_CR_CTL 0x00000119 -#define MSR_IA32_BBL_CR_CTL3 0x0000011e - -#define MSR_IA32_SYSENTER_CS 0x00000174 -#define MSR_IA32_SYSENTER_ESP 0x00000175 -#define MSR_IA32_SYSENTER_EIP 0x00000176 - -#define MSR_IA32_MCG_CAP 0x00000179 -#define MSR_IA32_MCG_STATUS 0x0000017a -#define MSR_IA32_MCG_CTL 0x0000017b -#define MSR_IA32_MCG_EXT_CTL 0x000004d0 - -#define MSR_OFFCORE_RSP_0 0x000001a6 -#define MSR_OFFCORE_RSP_1 0x000001a7 -#define MSR_TURBO_RATIO_LIMIT 0x000001ad -#define MSR_TURBO_RATIO_LIMIT1 0x000001ae -#define MSR_TURBO_RATIO_LIMIT2 0x000001af - -#define MSR_LBR_SELECT 0x000001c8 -#define MSR_LBR_TOS 0x000001c9 -#define MSR_LBR_NHM_FROM 0x00000680 -#define MSR_LBR_NHM_TO 0x000006c0 -#define MSR_LBR_CORE_FROM 0x00000040 -#define MSR_LBR_CORE_TO 0x00000060 - -#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ -#define LBR_INFO_MISPRED BIT_ULL(63) -#define LBR_INFO_IN_TX BIT_ULL(62) -#define LBR_INFO_ABORT BIT_ULL(61) -#define LBR_INFO_CYCLES 0xffff - -#define MSR_IA32_PEBS_ENABLE 0x000003f1 -#define MSR_IA32_DS_AREA 0x00000600 -#define MSR_IA32_PERF_CAPABILITIES 0x00000345 -#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 - -#define MSR_IA32_RTIT_CTL 0x00000570 -#define MSR_IA32_RTIT_STATUS 0x00000571 -#define MSR_IA32_RTIT_ADDR0_A 0x00000580 -#define MSR_IA32_RTIT_ADDR0_B 0x00000581 -#define MSR_IA32_RTIT_ADDR1_A 0x00000582 -#define MSR_IA32_RTIT_ADDR1_B 0x00000583 -#define MSR_IA32_RTIT_ADDR2_A 0x00000584 -#define MSR_IA32_RTIT_ADDR2_B 0x00000585 -#define MSR_IA32_RTIT_ADDR3_A 0x00000586 -#define MSR_IA32_RTIT_ADDR3_B 0x00000587 -#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 -#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 -#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 - -#define MSR_MTRRfix64K_00000 0x00000250 -#define MSR_MTRRfix16K_80000 0x00000258 -#define MSR_MTRRfix16K_A0000 0x00000259 -#define MSR_MTRRfix4K_C0000 0x00000268 -#define MSR_MTRRfix4K_C8000 0x00000269 -#define MSR_MTRRfix4K_D0000 0x0000026a -#define MSR_MTRRfix4K_D8000 0x0000026b -#define MSR_MTRRfix4K_E0000 0x0000026c -#define MSR_MTRRfix4K_E8000 0x0000026d -#define MSR_MTRRfix4K_F0000 0x0000026e -#define MSR_MTRRfix4K_F8000 0x0000026f -#define MSR_MTRRdefType 0x000002ff - -#define MSR_IA32_CR_PAT 0x00000277 - -#define MSR_IA32_DEBUGCTLMSR 0x000001d9 -#define MSR_IA32_LASTBRANCHFROMIP 0x000001db -#define MSR_IA32_LASTBRANCHTOIP 0x000001dc -#define MSR_IA32_LASTINTFROMIP 0x000001dd -#define MSR_IA32_LASTINTTOIP 0x000001de - -/* DEBUGCTLMSR bits (others vary by model): */ -#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ -#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ -#define DEBUGCTLMSR_TR (1UL << 6) -#define DEBUGCTLMSR_BTS (1UL << 7) -#define DEBUGCTLMSR_BTINT (1UL << 8) -#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) -#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) -#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) - -#define MSR_PEBS_FRONTEND 0x000003f7 - -#define MSR_IA32_POWER_CTL 0x000001fc - -#define MSR_IA32_MC0_CTL 0x00000400 -#define MSR_IA32_MC0_STATUS 0x00000401 -#define MSR_IA32_MC0_ADDR 0x00000402 -#define MSR_IA32_MC0_MISC 0x00000403 - -/* C-state Residency Counters */ -#define MSR_PKG_C3_RESIDENCY 0x000003f8 -#define MSR_PKG_C6_RESIDENCY 0x000003f9 -#define MSR_PKG_C7_RESIDENCY 0x000003fa -#define MSR_CORE_C3_RESIDENCY 0x000003fc -#define MSR_CORE_C6_RESIDENCY 0x000003fd -#define MSR_CORE_C7_RESIDENCY 0x000003fe -#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff -#define MSR_PKG_C2_RESIDENCY 0x0000060d -#define MSR_PKG_C8_RESIDENCY 0x00000630 -#define MSR_PKG_C9_RESIDENCY 0x00000631 -#define MSR_PKG_C10_RESIDENCY 0x00000632 - -/* Interrupt Response Limit */ -#define MSR_PKGC3_IRTL 0x0000060a -#define MSR_PKGC6_IRTL 0x0000060b -#define MSR_PKGC7_IRTL 0x0000060c -#define MSR_PKGC8_IRTL 0x00000633 -#define MSR_PKGC9_IRTL 0x00000634 -#define MSR_PKGC10_IRTL 0x00000635 - -/* Run Time Average Power Limiting (RAPL) Interface */ - -#define MSR_RAPL_POWER_UNIT 0x00000606 - -#define MSR_PKG_POWER_LIMIT 0x00000610 -#define MSR_PKG_ENERGY_STATUS 0x00000611 -#define MSR_PKG_PERF_STATUS 0x00000613 -#define MSR_PKG_POWER_INFO 0x00000614 - -#define MSR_DRAM_POWER_LIMIT 0x00000618 -#define MSR_DRAM_ENERGY_STATUS 0x00000619 -#define MSR_DRAM_PERF_STATUS 0x0000061b -#define MSR_DRAM_POWER_INFO 0x0000061c - -#define MSR_PP0_POWER_LIMIT 0x00000638 -#define MSR_PP0_ENERGY_STATUS 0x00000639 -#define MSR_PP0_POLICY 0x0000063a -#define MSR_PP0_PERF_STATUS 0x0000063b - -#define MSR_PP1_POWER_LIMIT 0x00000640 -#define MSR_PP1_ENERGY_STATUS 0x00000641 -#define MSR_PP1_POLICY 0x00000642 - -/* Config TDP MSRs */ -#define MSR_CONFIG_TDP_NOMINAL 0x00000648 -#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 -#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A -#define MSR_CONFIG_TDP_CONTROL 0x0000064B -#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C - -#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D - -#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 -#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 -#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A -#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B - -#define MSR_CORE_C1_RES 0x00000660 - -#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 -#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 - -#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 -#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 -#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 - -/* Hardware P state interface */ -#define MSR_PPERF 0x0000064e -#define MSR_PERF_LIMIT_REASONS 0x0000064f -#define MSR_PM_ENABLE 0x00000770 -#define MSR_HWP_CAPABILITIES 0x00000771 -#define MSR_HWP_REQUEST_PKG 0x00000772 -#define MSR_HWP_INTERRUPT 0x00000773 -#define MSR_HWP_REQUEST 0x00000774 -#define MSR_HWP_STATUS 0x00000777 - -/* CPUID.6.EAX */ -#define HWP_BASE_BIT (1<<7) -#define HWP_NOTIFICATIONS_BIT (1<<8) -#define HWP_ACTIVITY_WINDOW_BIT (1<<9) -#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) -#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) - -/* IA32_HWP_CAPABILITIES */ -#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) -#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) -#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) -#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) - -/* IA32_HWP_REQUEST */ -#define HWP_MIN_PERF(x) (x & 0xff) -#define HWP_MAX_PERF(x) ((x & 0xff) << 8) -#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) -#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) -#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) -#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) - -/* IA32_HWP_STATUS */ -#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) - -/* IA32_HWP_INTERRUPT */ -#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) - -#define MSR_AMD64_MC0_MASK 0xc0010044 - -#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) -#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) -#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) -#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) - -#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) - -/* These are consecutive and not in the normal 4er MCE bank block */ -#define MSR_IA32_MC0_CTL2 0x00000280 -#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) - -#define MSR_P6_PERFCTR0 0x000000c1 -#define MSR_P6_PERFCTR1 0x000000c2 -#define MSR_P6_EVNTSEL0 0x00000186 -#define MSR_P6_EVNTSEL1 0x00000187 - -#define MSR_KNC_PERFCTR0 0x00000020 -#define MSR_KNC_PERFCTR1 0x00000021 -#define MSR_KNC_EVNTSEL0 0x00000028 -#define MSR_KNC_EVNTSEL1 0x00000029 - -/* Alternative perfctr range with full access. */ -#define MSR_IA32_PMC0 0x000004c1 - -/* AMD64 MSRs. Not complete. See the architecture manual for a more - complete list. */ - -#define MSR_AMD64_PATCH_LEVEL 0x0000008b -#define MSR_AMD64_TSC_RATIO 0xc0000104 -#define MSR_AMD64_NB_CFG 0xc001001f -#define MSR_AMD64_PATCH_LOADER 0xc0010020 -#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 -#define MSR_AMD64_OSVW_STATUS 0xc0010141 -#define MSR_AMD64_LS_CFG 0xc0011020 -#define MSR_AMD64_DC_CFG 0xc0011022 -#define MSR_AMD64_BU_CFG2 0xc001102a -#define MSR_AMD64_IBSFETCHCTL 0xc0011030 -#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 -#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 -#define MSR_AMD64_IBSFETCH_REG_COUNT 3 -#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) -#define MSR_AMD64_IBSOPCTL 0xc0011033 -#define MSR_AMD64_IBSOPRIP 0xc0011034 -#define MSR_AMD64_IBSOPDATA 0xc0011035 -#define MSR_AMD64_IBSOPDATA2 0xc0011036 -#define MSR_AMD64_IBSOPDATA3 0xc0011037 -#define MSR_AMD64_IBSDCLINAD 0xc0011038 -#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 -#define MSR_AMD64_IBSOP_REG_COUNT 7 -#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) -#define MSR_AMD64_IBSCTL 0xc001103a -#define MSR_AMD64_IBSBRTARGET 0xc001103b -#define MSR_AMD64_IBSOPDATA4 0xc001103d -#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ - -/* Fam 17h MSRs */ -#define MSR_F17H_IRPERF 0xc00000e9 - -/* Fam 16h MSRs */ -#define MSR_F16H_L2I_PERF_CTL 0xc0010230 -#define MSR_F16H_L2I_PERF_CTR 0xc0010231 -#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 -#define MSR_F16H_DR2_ADDR_MASK 0xc001101a -#define MSR_F16H_DR3_ADDR_MASK 0xc001101b -#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 - -/* Fam 15h MSRs */ -#define MSR_F15H_PERF_CTL 0xc0010200 -#define MSR_F15H_PERF_CTR 0xc0010201 -#define MSR_F15H_NB_PERF_CTL 0xc0010240 -#define MSR_F15H_NB_PERF_CTR 0xc0010241 -#define MSR_F15H_PTSC 0xc0010280 -#define MSR_F15H_IC_CFG 0xc0011021 - -/* Fam 10h MSRs */ -#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 -#define FAM10H_MMIO_CONF_ENABLE (1<<0) -#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf -#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 -#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL -#define FAM10H_MMIO_CONF_BASE_SHIFT 20 -#define MSR_FAM10H_NODE_ID 0xc001100c - -/* K8 MSRs */ -#define MSR_K8_TOP_MEM1 0xc001001a -#define MSR_K8_TOP_MEM2 0xc001001d -#define MSR_K8_SYSCFG 0xc0010010 -#define MSR_K8_INT_PENDING_MSG 0xc0010055 -/* C1E active bits in int pending message */ -#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 -#define MSR_K8_TSEG_ADDR 0xc0010112 -#define MSR_K8_TSEG_MASK 0xc0010113 -#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ -#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ -#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ - -/* K7 MSRs */ -#define MSR_K7_EVNTSEL0 0xc0010000 -#define MSR_K7_PERFCTR0 0xc0010004 -#define MSR_K7_EVNTSEL1 0xc0010001 -#define MSR_K7_PERFCTR1 0xc0010005 -#define MSR_K7_EVNTSEL2 0xc0010002 -#define MSR_K7_PERFCTR2 0xc0010006 -#define MSR_K7_EVNTSEL3 0xc0010003 -#define MSR_K7_PERFCTR3 0xc0010007 -#define MSR_K7_CLK_CTL 0xc001001b -#define MSR_K7_HWCR 0xc0010015 -#define MSR_K7_FID_VID_CTL 0xc0010041 -#define MSR_K7_FID_VID_STATUS 0xc0010042 - -/* K6 MSRs */ -#define MSR_K6_WHCR 0xc0000082 -#define MSR_K6_UWCCR 0xc0000085 -#define MSR_K6_EPMR 0xc0000086 -#define MSR_K6_PSOR 0xc0000087 -#define MSR_K6_PFIR 0xc0000088 - -/* Centaur-Hauls/IDT defined MSRs. */ -#define MSR_IDT_FCR1 0x00000107 -#define MSR_IDT_FCR2 0x00000108 -#define MSR_IDT_FCR3 0x00000109 -#define MSR_IDT_FCR4 0x0000010a - -#define MSR_IDT_MCR0 0x00000110 -#define MSR_IDT_MCR1 0x00000111 -#define MSR_IDT_MCR2 0x00000112 -#define MSR_IDT_MCR3 0x00000113 -#define MSR_IDT_MCR4 0x00000114 -#define MSR_IDT_MCR5 0x00000115 -#define MSR_IDT_MCR6 0x00000116 -#define MSR_IDT_MCR7 0x00000117 -#define MSR_IDT_MCR_CTRL 0x00000120 - -/* VIA Cyrix defined MSRs*/ -#define MSR_VIA_FCR 0x00001107 -#define MSR_VIA_LONGHAUL 0x0000110a -#define MSR_VIA_RNG 0x0000110b -#define MSR_VIA_BCR2 0x00001147 - -/* Transmeta defined MSRs */ -#define MSR_TMTA_LONGRUN_CTRL 0x80868010 -#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 -#define MSR_TMTA_LRTI_READOUT 0x80868018 -#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a - -/* Intel defined MSRs. */ -#define MSR_IA32_P5_MC_ADDR 0x00000000 -#define MSR_IA32_P5_MC_TYPE 0x00000001 -#define MSR_IA32_TSC 0x00000010 -#define MSR_IA32_PLATFORM_ID 0x00000017 -#define MSR_IA32_EBL_CR_POWERON 0x0000002a -#define MSR_EBC_FREQUENCY_ID 0x0000002c -#define MSR_SMI_COUNT 0x00000034 -#define MSR_IA32_FEATURE_CONTROL 0x0000003a -#define MSR_IA32_TSC_ADJUST 0x0000003b -#define MSR_IA32_BNDCFGS 0x00000d90 - -#define MSR_IA32_XSS 0x00000da0 - -#define FEATURE_CONTROL_LOCKED (1<<0) -#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) -#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) -#define FEATURE_CONTROL_LMCE (1<<20) - -#define MSR_IA32_APICBASE 0x0000001b -#define MSR_IA32_APICBASE_BSP (1<<8) -#define MSR_IA32_APICBASE_ENABLE (1<<11) -#define MSR_IA32_APICBASE_BASE (0xfffff<<12) - -#define MSR_IA32_TSCDEADLINE 0x000006e0 - -#define MSR_IA32_UCODE_WRITE 0x00000079 -#define MSR_IA32_UCODE_REV 0x0000008b - -#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b -#define MSR_IA32_SMBASE 0x0000009e - -#define MSR_IA32_PERF_STATUS 0x00000198 -#define MSR_IA32_PERF_CTL 0x00000199 -#define INTEL_PERF_CTL_MASK 0xffff -#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 -#define MSR_AMD_PERF_STATUS 0xc0010063 -#define MSR_AMD_PERF_CTL 0xc0010062 - -#define MSR_IA32_MPERF 0x000000e7 -#define MSR_IA32_APERF 0x000000e8 - -#define MSR_IA32_THERM_CONTROL 0x0000019a -#define MSR_IA32_THERM_INTERRUPT 0x0000019b - -#define THERM_INT_HIGH_ENABLE (1 << 0) -#define THERM_INT_LOW_ENABLE (1 << 1) -#define THERM_INT_PLN_ENABLE (1 << 24) - -#define MSR_IA32_THERM_STATUS 0x0000019c - -#define THERM_STATUS_PROCHOT (1 << 0) -#define THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_THERM2_CTL 0x0000019d - -#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) - -#define MSR_IA32_MISC_ENABLE 0x000001a0 - -#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 - -#define MSR_MISC_PWR_MGMT 0x000001aa - -#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 -#define ENERGY_PERF_BIAS_PERFORMANCE 0 -#define ENERGY_PERF_BIAS_NORMAL 6 -#define ENERGY_PERF_BIAS_POWERSAVE 15 - -#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 - -#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) -#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 - -#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) -#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) -#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) - -/* Thermal Thresholds Support */ -#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) -#define THERM_SHIFT_THRESHOLD0 8 -#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) -#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) -#define THERM_SHIFT_THRESHOLD1 16 -#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) -#define THERM_STATUS_THRESHOLD0 (1 << 6) -#define THERM_LOG_THRESHOLD0 (1 << 7) -#define THERM_STATUS_THRESHOLD1 (1 << 8) -#define THERM_LOG_THRESHOLD1 (1 << 9) - -/* MISC_ENABLE bits: architectural */ -#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 -#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) -#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 -#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) -#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 -#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) -#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 -#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 -#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) - -/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ -#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 -#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) -#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 -#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) -#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 -#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) - -#define MSR_IA32_TSC_DEADLINE 0x000006E0 - -/* P4/Xeon+ specific */ -#define MSR_IA32_MCG_EAX 0x00000180 -#define MSR_IA32_MCG_EBX 0x00000181 -#define MSR_IA32_MCG_ECX 0x00000182 -#define MSR_IA32_MCG_EDX 0x00000183 -#define MSR_IA32_MCG_ESI 0x00000184 -#define MSR_IA32_MCG_EDI 0x00000185 -#define MSR_IA32_MCG_EBP 0x00000186 -#define MSR_IA32_MCG_ESP 0x00000187 -#define MSR_IA32_MCG_EFLAGS 0x00000188 -#define MSR_IA32_MCG_EIP 0x00000189 -#define MSR_IA32_MCG_RESERVED 0x0000018a - -/* Pentium IV performance counter MSRs */ -#define MSR_P4_BPU_PERFCTR0 0x00000300 -#define MSR_P4_BPU_PERFCTR1 0x00000301 -#define MSR_P4_BPU_PERFCTR2 0x00000302 -#define MSR_P4_BPU_PERFCTR3 0x00000303 -#define MSR_P4_MS_PERFCTR0 0x00000304 -#define MSR_P4_MS_PERFCTR1 0x00000305 -#define MSR_P4_MS_PERFCTR2 0x00000306 -#define MSR_P4_MS_PERFCTR3 0x00000307 -#define MSR_P4_FLAME_PERFCTR0 0x00000308 -#define MSR_P4_FLAME_PERFCTR1 0x00000309 -#define MSR_P4_FLAME_PERFCTR2 0x0000030a -#define MSR_P4_FLAME_PERFCTR3 0x0000030b -#define MSR_P4_IQ_PERFCTR0 0x0000030c -#define MSR_P4_IQ_PERFCTR1 0x0000030d -#define MSR_P4_IQ_PERFCTR2 0x0000030e -#define MSR_P4_IQ_PERFCTR3 0x0000030f -#define MSR_P4_IQ_PERFCTR4 0x00000310 -#define MSR_P4_IQ_PERFCTR5 0x00000311 -#define MSR_P4_BPU_CCCR0 0x00000360 -#define MSR_P4_BPU_CCCR1 0x00000361 -#define MSR_P4_BPU_CCCR2 0x00000362 -#define MSR_P4_BPU_CCCR3 0x00000363 -#define MSR_P4_MS_CCCR0 0x00000364 -#define MSR_P4_MS_CCCR1 0x00000365 -#define MSR_P4_MS_CCCR2 0x00000366 -#define MSR_P4_MS_CCCR3 0x00000367 -#define MSR_P4_FLAME_CCCR0 0x00000368 -#define MSR_P4_FLAME_CCCR1 0x00000369 -#define MSR_P4_FLAME_CCCR2 0x0000036a -#define MSR_P4_FLAME_CCCR3 0x0000036b -#define MSR_P4_IQ_CCCR0 0x0000036c -#define MSR_P4_IQ_CCCR1 0x0000036d -#define MSR_P4_IQ_CCCR2 0x0000036e -#define MSR_P4_IQ_CCCR3 0x0000036f -#define MSR_P4_IQ_CCCR4 0x00000370 -#define MSR_P4_IQ_CCCR5 0x00000371 -#define MSR_P4_ALF_ESCR0 0x000003ca -#define MSR_P4_ALF_ESCR1 0x000003cb -#define MSR_P4_BPU_ESCR0 0x000003b2 -#define MSR_P4_BPU_ESCR1 0x000003b3 -#define MSR_P4_BSU_ESCR0 0x000003a0 -#define MSR_P4_BSU_ESCR1 0x000003a1 -#define MSR_P4_CRU_ESCR0 0x000003b8 -#define MSR_P4_CRU_ESCR1 0x000003b9 -#define MSR_P4_CRU_ESCR2 0x000003cc -#define MSR_P4_CRU_ESCR3 0x000003cd -#define MSR_P4_CRU_ESCR4 0x000003e0 -#define MSR_P4_CRU_ESCR5 0x000003e1 -#define MSR_P4_DAC_ESCR0 0x000003a8 -#define MSR_P4_DAC_ESCR1 0x000003a9 -#define MSR_P4_FIRM_ESCR0 0x000003a4 -#define MSR_P4_FIRM_ESCR1 0x000003a5 -#define MSR_P4_FLAME_ESCR0 0x000003a6 -#define MSR_P4_FLAME_ESCR1 0x000003a7 -#define MSR_P4_FSB_ESCR0 0x000003a2 -#define MSR_P4_FSB_ESCR1 0x000003a3 -#define MSR_P4_IQ_ESCR0 0x000003ba -#define MSR_P4_IQ_ESCR1 0x000003bb -#define MSR_P4_IS_ESCR0 0x000003b4 -#define MSR_P4_IS_ESCR1 0x000003b5 -#define MSR_P4_ITLB_ESCR0 0x000003b6 -#define MSR_P4_ITLB_ESCR1 0x000003b7 -#define MSR_P4_IX_ESCR0 0x000003c8 -#define MSR_P4_IX_ESCR1 0x000003c9 -#define MSR_P4_MOB_ESCR0 0x000003aa -#define MSR_P4_MOB_ESCR1 0x000003ab -#define MSR_P4_MS_ESCR0 0x000003c0 -#define MSR_P4_MS_ESCR1 0x000003c1 -#define MSR_P4_PMH_ESCR0 0x000003ac -#define MSR_P4_PMH_ESCR1 0x000003ad -#define MSR_P4_RAT_ESCR0 0x000003bc -#define MSR_P4_RAT_ESCR1 0x000003bd -#define MSR_P4_SAAT_ESCR0 0x000003ae -#define MSR_P4_SAAT_ESCR1 0x000003af -#define MSR_P4_SSU_ESCR0 0x000003be -#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ - -#define MSR_P4_TBPU_ESCR0 0x000003c2 -#define MSR_P4_TBPU_ESCR1 0x000003c3 -#define MSR_P4_TC_ESCR0 0x000003c4 -#define MSR_P4_TC_ESCR1 0x000003c5 -#define MSR_P4_U2L_ESCR0 0x000003b0 -#define MSR_P4_U2L_ESCR1 0x000003b1 - -#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 - -/* Intel Core-based CPU performance counters */ -#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 -#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a -#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b -#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d -#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e -#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f -#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 - -/* Geode defined MSRs */ -#define MSR_GEODE_BUSCONT_CONF0 0x00001900 - -/* Intel VT MSRs */ -#define MSR_IA32_VMX_BASIC 0x00000480 -#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 -#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 -#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 -#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 -#define MSR_IA32_VMX_MISC 0x00000485 -#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 -#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 -#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 -#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 -#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a -#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b -#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c -#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d -#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e -#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f -#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 -#define MSR_IA32_VMX_VMFUNC 0x00000491 - -/* VMX_BASIC bits and bitmasks */ -#define VMX_BASIC_VMCS_SIZE_SHIFT 32 -#define VMX_BASIC_TRUE_CTLS (1ULL << 55) -#define VMX_BASIC_64 0x0001000000000000LLU -#define VMX_BASIC_MEM_TYPE_SHIFT 50 -#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU -#define VMX_BASIC_MEM_TYPE_WB 6LLU -#define VMX_BASIC_INOUT 0x0040000000000000LLU - -/* MSR_IA32_VMX_MISC bits */ -#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) -#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F -/* AMD-V MSRs */ - -#define MSR_VM_CR 0xc0010114 -#define MSR_VM_IGNNE 0xc0010115 -#define MSR_VM_HSAVE_PA 0xc0010117 +#include <uapi/asm/msr-index.h> #endif /* _ASM_X86_MSR_INDEX_H */ diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h new file mode 100644 index 000000000000..d097e832ee3c --- /dev/null +++ b/arch/x86/include/uapi/asm/msr-index.h @@ -0,0 +1,698 @@ +#ifndef _UAPI_ASM_X86_MSR_INDEX_H +#define _UAPI_ASM_X86_MSR_INDEX_H + +/* + * CPU model specific register (MSR) numbers. + * + * Do not add new entries to this file unless the definitions are shared + * between multiple compilation units. + */ + +/* x86-64 specific MSRs */ +#define MSR_EFER 0xc0000080 /* extended feature register */ +#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ +#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ +#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ +#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ +#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ +#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ +#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ +#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ + +/* EFER bits: */ +#define _EFER_SCE 0 /* SYSCALL/SYSRET */ +#define _EFER_LME 8 /* Long mode enable */ +#define _EFER_LMA 10 /* Long mode active (read-only) */ +#define _EFER_NX 11 /* No execute enable */ +#define _EFER_SVME 12 /* Enable virtualization */ +#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ +#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ + +#define EFER_SCE (1<<_EFER_SCE) +#define EFER_LME (1<<_EFER_LME) +#define EFER_LMA (1<<_EFER_LMA) +#define EFER_NX (1<<_EFER_NX) +#define EFER_SVME (1<<_EFER_SVME) +#define EFER_LMSLE (1<<_EFER_LMSLE) +#define EFER_FFXSR (1<<_EFER_FFXSR) + +/* Intel MSRs. Some also available on other CPUs */ + +#define MSR_PPIN_CTL 0x0000004e +#define MSR_PPIN 0x0000004f + +#define MSR_IA32_PERFCTR0 0x000000c1 +#define MSR_IA32_PERFCTR1 0x000000c2 +#define MSR_FSB_FREQ 0x000000cd +#define MSR_PLATFORM_INFO 0x000000ce + +#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 +#define NHM_C3_AUTO_DEMOTE (1UL << 25) +#define NHM_C1_AUTO_DEMOTE (1UL << 26) +#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) +#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) +#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) + +#define MSR_MTRRcap 0x000000fe +#define MSR_IA32_BBL_CR_CTL 0x00000119 +#define MSR_IA32_BBL_CR_CTL3 0x0000011e + +#define MSR_IA32_SYSENTER_CS 0x00000174 +#define MSR_IA32_SYSENTER_ESP 0x00000175 +#define MSR_IA32_SYSENTER_EIP 0x00000176 + +#define MSR_IA32_MCG_CAP 0x00000179 +#define MSR_IA32_MCG_STATUS 0x0000017a +#define MSR_IA32_MCG_CTL 0x0000017b +#define MSR_IA32_MCG_EXT_CTL 0x000004d0 + +#define MSR_OFFCORE_RSP_0 0x000001a6 +#define MSR_OFFCORE_RSP_1 0x000001a7 +#define MSR_TURBO_RATIO_LIMIT 0x000001ad +#define MSR_TURBO_RATIO_LIMIT1 0x000001ae +#define MSR_TURBO_RATIO_LIMIT2 0x000001af + +#define MSR_LBR_SELECT 0x000001c8 +#define MSR_LBR_TOS 0x000001c9 +#define MSR_LBR_NHM_FROM 0x00000680 +#define MSR_LBR_NHM_TO 0x000006c0 +#define MSR_LBR_CORE_FROM 0x00000040 +#define MSR_LBR_CORE_TO 0x00000060 + +#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ +#define LBR_INFO_MISPRED BIT_ULL(63) +#define LBR_INFO_IN_TX BIT_ULL(62) +#define LBR_INFO_ABORT BIT_ULL(61) +#define LBR_INFO_CYCLES 0xffff + +#define MSR_IA32_PEBS_ENABLE 0x000003f1 +#define MSR_IA32_DS_AREA 0x00000600 +#define MSR_IA32_PERF_CAPABILITIES 0x00000345 +#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 + +#define MSR_IA32_RTIT_CTL 0x00000570 +#define MSR_IA32_RTIT_STATUS 0x00000571 +#define MSR_IA32_RTIT_ADDR0_A 0x00000580 +#define MSR_IA32_RTIT_ADDR0_B 0x00000581 +#define MSR_IA32_RTIT_ADDR1_A 0x00000582 +#define MSR_IA32_RTIT_ADDR1_B 0x00000583 +#define MSR_IA32_RTIT_ADDR2_A 0x00000584 +#define MSR_IA32_RTIT_ADDR2_B 0x00000585 +#define MSR_IA32_RTIT_ADDR3_A 0x00000586 +#define MSR_IA32_RTIT_ADDR3_B 0x00000587 +#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 +#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 +#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 + +#define MSR_MTRRfix64K_00000 0x00000250 +#define MSR_MTRRfix16K_80000 0x00000258 +#define MSR_MTRRfix16K_A0000 0x00000259 +#define MSR_MTRRfix4K_C0000 0x00000268 +#define MSR_MTRRfix4K_C8000 0x00000269 +#define MSR_MTRRfix4K_D0000 0x0000026a +#define MSR_MTRRfix4K_D8000 0x0000026b +#define MSR_MTRRfix4K_E0000 0x0000026c +#define MSR_MTRRfix4K_E8000 0x0000026d +#define MSR_MTRRfix4K_F0000 0x0000026e +#define MSR_MTRRfix4K_F8000 0x0000026f +#define MSR_MTRRdefType 0x000002ff + +#define MSR_IA32_CR_PAT 0x00000277 + +#define MSR_IA32_DEBUGCTLMSR 0x000001d9 +#define MSR_IA32_LASTBRANCHFROMIP 0x000001db +#define MSR_IA32_LASTBRANCHTOIP 0x000001dc +#define MSR_IA32_LASTINTFROMIP 0x000001dd +#define MSR_IA32_LASTINTTOIP 0x000001de + +/* DEBUGCTLMSR bits (others vary by model): */ +#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ +#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ +#define DEBUGCTLMSR_TR (1UL << 6) +#define DEBUGCTLMSR_BTS (1UL << 7) +#define DEBUGCTLMSR_BTINT (1UL << 8) +#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) +#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) +#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) + +#define MSR_PEBS_FRONTEND 0x000003f7 + +#define MSR_IA32_POWER_CTL 0x000001fc + +#define MSR_IA32_MC0_CTL 0x00000400 +#define MSR_IA32_MC0_STATUS 0x00000401 +#define MSR_IA32_MC0_ADDR 0x00000402 +#define MSR_IA32_MC0_MISC 0x00000403 + +/* C-state Residency Counters */ +#define MSR_PKG_C3_RESIDENCY 0x000003f8 +#define MSR_PKG_C6_RESIDENCY 0x000003f9 +#define MSR_PKG_C7_RESIDENCY 0x000003fa +#define MSR_CORE_C3_RESIDENCY 0x000003fc +#define MSR_CORE_C6_RESIDENCY 0x000003fd +#define MSR_CORE_C7_RESIDENCY 0x000003fe +#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff +#define MSR_PKG_C2_RESIDENCY 0x0000060d +#define MSR_PKG_C8_RESIDENCY 0x00000630 +#define MSR_PKG_C9_RESIDENCY 0x00000631 +#define MSR_PKG_C10_RESIDENCY 0x00000632 + +/* Interrupt Response Limit */ +#define MSR_PKGC3_IRTL 0x0000060a +#define MSR_PKGC6_IRTL 0x0000060b +#define MSR_PKGC7_IRTL 0x0000060c +#define MSR_PKGC8_IRTL 0x00000633 +#define MSR_PKGC9_IRTL 0x00000634 +#define MSR_PKGC10_IRTL 0x00000635 + +/* Run Time Average Power Limiting (RAPL) Interface */ + +#define MSR_RAPL_POWER_UNIT 0x00000606 + +#define MSR_PKG_POWER_LIMIT 0x00000610 +#define MSR_PKG_ENERGY_STATUS 0x00000611 +#define MSR_PKG_PERF_STATUS 0x00000613 +#define MSR_PKG_POWER_INFO 0x00000614 + +#define MSR_DRAM_POWER_LIMIT 0x00000618 +#define MSR_DRAM_ENERGY_STATUS 0x00000619 +#define MSR_DRAM_PERF_STATUS 0x0000061b +#define MSR_DRAM_POWER_INFO 0x0000061c + +#define MSR_PP0_POWER_LIMIT 0x00000638 +#define MSR_PP0_ENERGY_STATUS 0x00000639 +#define MSR_PP0_POLICY 0x0000063a +#define MSR_PP0_PERF_STATUS 0x0000063b + +#define MSR_PP1_POWER_LIMIT 0x00000640 +#define MSR_PP1_ENERGY_STATUS 0x00000641 +#define MSR_PP1_POLICY 0x00000642 + +/* Config TDP MSRs */ +#define MSR_CONFIG_TDP_NOMINAL 0x00000648 +#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 +#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A +#define MSR_CONFIG_TDP_CONTROL 0x0000064B +#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C + +#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D + +#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 +#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 +#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A +#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B + +#define MSR_CORE_C1_RES 0x00000660 + +#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 +#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 + +#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 +#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 +#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 + +/* Hardware P state interface */ +#define MSR_PPERF 0x0000064e +#define MSR_PERF_LIMIT_REASONS 0x0000064f +#define MSR_PM_ENABLE 0x00000770 +#define MSR_HWP_CAPABILITIES 0x00000771 +#define MSR_HWP_REQUEST_PKG 0x00000772 +#define MSR_HWP_INTERRUPT 0x00000773 +#define MSR_HWP_REQUEST 0x00000774 +#define MSR_HWP_STATUS 0x00000777 + +/* CPUID.6.EAX */ +#define HWP_BASE_BIT (1<<7) +#define HWP_NOTIFICATIONS_BIT (1<<8) +#define HWP_ACTIVITY_WINDOW_BIT (1<<9) +#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) +#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) + +/* IA32_HWP_CAPABILITIES */ +#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) +#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) +#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) +#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) + +/* IA32_HWP_REQUEST */ +#define HWP_MIN_PERF(x) (x & 0xff) +#define HWP_MAX_PERF(x) ((x & 0xff) << 8) +#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) +#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) +#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) +#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) + +/* IA32_HWP_STATUS */ +#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) + +/* IA32_HWP_INTERRUPT */ +#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) + +#define MSR_AMD64_MC0_MASK 0xc0010044 + +#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) +#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) +#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) +#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) + +#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) + +/* These are consecutive and not in the normal 4er MCE bank block */ +#define MSR_IA32_MC0_CTL2 0x00000280 +#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) + +#define MSR_P6_PERFCTR0 0x000000c1 +#define MSR_P6_PERFCTR1 0x000000c2 +#define MSR_P6_EVNTSEL0 0x00000186 +#define MSR_P6_EVNTSEL1 0x00000187 + +#define MSR_KNC_PERFCTR0 0x00000020 +#define MSR_KNC_PERFCTR1 0x00000021 +#define MSR_KNC_EVNTSEL0 0x00000028 +#define MSR_KNC_EVNTSEL1 0x00000029 + +/* Alternative perfctr range with full access. */ +#define MSR_IA32_PMC0 0x000004c1 + +/* AMD64 MSRs. Not complete. See the architecture manual for a more + complete list. */ + +#define MSR_AMD64_PATCH_LEVEL 0x0000008b +#define MSR_AMD64_TSC_RATIO 0xc0000104 +#define MSR_AMD64_NB_CFG 0xc001001f +#define MSR_AMD64_PATCH_LOADER 0xc0010020 +#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 +#define MSR_AMD64_OSVW_STATUS 0xc0010141 +#define MSR_AMD64_LS_CFG 0xc0011020 +#define MSR_AMD64_DC_CFG 0xc0011022 +#define MSR_AMD64_BU_CFG2 0xc001102a +#define MSR_AMD64_IBSFETCHCTL 0xc0011030 +#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 +#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 +#define MSR_AMD64_IBSFETCH_REG_COUNT 3 +#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) +#define MSR_AMD64_IBSOPCTL 0xc0011033 +#define MSR_AMD64_IBSOPRIP 0xc0011034 +#define MSR_AMD64_IBSOPDATA 0xc0011035 +#define MSR_AMD64_IBSOPDATA2 0xc0011036 +#define MSR_AMD64_IBSOPDATA3 0xc0011037 +#define MSR_AMD64_IBSDCLINAD 0xc0011038 +#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 +#define MSR_AMD64_IBSOP_REG_COUNT 7 +#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) +#define MSR_AMD64_IBSCTL 0xc001103a +#define MSR_AMD64_IBSBRTARGET 0xc001103b +#define MSR_AMD64_IBSOPDATA4 0xc001103d +#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ + +/* Fam 17h MSRs */ +#define MSR_F17H_IRPERF 0xc00000e9 + +/* Fam 16h MSRs */ +#define MSR_F16H_L2I_PERF_CTL 0xc0010230 +#define MSR_F16H_L2I_PERF_CTR 0xc0010231 +#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 +#define MSR_F16H_DR2_ADDR_MASK 0xc001101a +#define MSR_F16H_DR3_ADDR_MASK 0xc001101b +#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 + +/* Fam 15h MSRs */ +#define MSR_F15H_PERF_CTL 0xc0010200 +#define MSR_F15H_PERF_CTR 0xc0010201 +#define MSR_F15H_NB_PERF_CTL 0xc0010240 +#define MSR_F15H_NB_PERF_CTR 0xc0010241 +#define MSR_F15H_PTSC 0xc0010280 +#define MSR_F15H_IC_CFG 0xc0011021 + +/* Fam 10h MSRs */ +#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 +#define FAM10H_MMIO_CONF_ENABLE (1<<0) +#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf +#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 +#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL +#define FAM10H_MMIO_CONF_BASE_SHIFT 20 +#define MSR_FAM10H_NODE_ID 0xc001100c + +/* K8 MSRs */ +#define MSR_K8_TOP_MEM1 0xc001001a +#define MSR_K8_TOP_MEM2 0xc001001d +#define MSR_K8_SYSCFG 0xc0010010 +#define MSR_K8_INT_PENDING_MSG 0xc0010055 +/* C1E active bits in int pending message */ +#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 +#define MSR_K8_TSEG_ADDR 0xc0010112 +#define MSR_K8_TSEG_MASK 0xc0010113 +#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ +#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ +#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ + +/* K7 MSRs */ +#define MSR_K7_EVNTSEL0 0xc0010000 +#define MSR_K7_PERFCTR0 0xc0010004 +#define MSR_K7_EVNTSEL1 0xc0010001 +#define MSR_K7_PERFCTR1 0xc0010005 +#define MSR_K7_EVNTSEL2 0xc0010002 +#define MSR_K7_PERFCTR2 0xc0010006 +#define MSR_K7_EVNTSEL3 0xc0010003 +#define MSR_K7_PERFCTR3 0xc0010007 +#define MSR_K7_CLK_CTL 0xc001001b +#define MSR_K7_HWCR 0xc0010015 +#define MSR_K7_FID_VID_CTL 0xc0010041 +#define MSR_K7_FID_VID_STATUS 0xc0010042 + +/* K6 MSRs */ +#define MSR_K6_WHCR 0xc0000082 +#define MSR_K6_UWCCR 0xc0000085 +#define MSR_K6_EPMR 0xc0000086 +#define MSR_K6_PSOR 0xc0000087 +#define MSR_K6_PFIR 0xc0000088 + +/* Centaur-Hauls/IDT defined MSRs. */ +#define MSR_IDT_FCR1 0x00000107 +#define MSR_IDT_FCR2 0x00000108 +#define MSR_IDT_FCR3 0x00000109 +#define MSR_IDT_FCR4 0x0000010a + +#define MSR_IDT_MCR0 0x00000110 +#define MSR_IDT_MCR1 0x00000111 +#define MSR_IDT_MCR2 0x00000112 +#define MSR_IDT_MCR3 0x00000113 +#define MSR_IDT_MCR4 0x00000114 +#define MSR_IDT_MCR5 0x00000115 +#define MSR_IDT_MCR6 0x00000116 +#define MSR_IDT_MCR7 0x00000117 +#define MSR_IDT_MCR_CTRL 0x00000120 + +/* VIA Cyrix defined MSRs*/ +#define MSR_VIA_FCR 0x00001107 +#define MSR_VIA_LONGHAUL 0x0000110a +#define MSR_VIA_RNG 0x0000110b +#define MSR_VIA_BCR2 0x00001147 + +/* Transmeta defined MSRs */ +#define MSR_TMTA_LONGRUN_CTRL 0x80868010 +#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 +#define MSR_TMTA_LRTI_READOUT 0x80868018 +#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a + +/* Intel defined MSRs. */ +#define MSR_IA32_P5_MC_ADDR 0x00000000 +#define MSR_IA32_P5_MC_TYPE 0x00000001 +#define MSR_IA32_TSC 0x00000010 +#define MSR_IA32_PLATFORM_ID 0x00000017 +#define MSR_IA32_EBL_CR_POWERON 0x0000002a +#define MSR_EBC_FREQUENCY_ID 0x0000002c +#define MSR_SMI_COUNT 0x00000034 +#define MSR_IA32_FEATURE_CONTROL 0x0000003a +#define MSR_IA32_TSC_ADJUST 0x0000003b +#define MSR_IA32_BNDCFGS 0x00000d90 + +#define MSR_IA32_XSS 0x00000da0 + +#define FEATURE_CONTROL_LOCKED (1<<0) +#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) +#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) +#define FEATURE_CONTROL_LMCE (1<<20) + +#define MSR_IA32_APICBASE 0x0000001b +#define MSR_IA32_APICBASE_BSP (1<<8) +#define MSR_IA32_APICBASE_ENABLE (1<<11) +#define MSR_IA32_APICBASE_BASE (0xfffff<<12) + +#define MSR_IA32_TSCDEADLINE 0x000006e0 + +#define MSR_IA32_UCODE_WRITE 0x00000079 +#define MSR_IA32_UCODE_REV 0x0000008b + +#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b +#define MSR_IA32_SMBASE 0x0000009e + +#define MSR_IA32_PERF_STATUS 0x00000198 +#define MSR_IA32_PERF_CTL 0x00000199 +#define INTEL_PERF_CTL_MASK 0xffff +#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 +#define MSR_AMD_PERF_STATUS 0xc0010063 +#define MSR_AMD_PERF_CTL 0xc0010062 + +#define MSR_IA32_MPERF 0x000000e7 +#define MSR_IA32_APERF 0x000000e8 + +#define MSR_IA32_THERM_CONTROL 0x0000019a +#define MSR_IA32_THERM_INTERRUPT 0x0000019b + +#define THERM_INT_HIGH_ENABLE (1 << 0) +#define THERM_INT_LOW_ENABLE (1 << 1) +#define THERM_INT_PLN_ENABLE (1 << 24) + +#define MSR_IA32_THERM_STATUS 0x0000019c + +#define THERM_STATUS_PROCHOT (1 << 0) +#define THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_THERM2_CTL 0x0000019d + +#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) + +#define MSR_IA32_MISC_ENABLE 0x000001a0 + +#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 + +#define MSR_MISC_PWR_MGMT 0x000001aa + +#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 +#define ENERGY_PERF_BIAS_PERFORMANCE 0 +#define ENERGY_PERF_BIAS_NORMAL 6 +#define ENERGY_PERF_BIAS_POWERSAVE 15 + +#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 + +#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) +#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 + +#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) +#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) +#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) + +/* Thermal Thresholds Support */ +#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) +#define THERM_SHIFT_THRESHOLD0 8 +#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) +#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) +#define THERM_SHIFT_THRESHOLD1 16 +#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) +#define THERM_STATUS_THRESHOLD0 (1 << 6) +#define THERM_LOG_THRESHOLD0 (1 << 7) +#define THERM_STATUS_THRESHOLD1 (1 << 8) +#define THERM_LOG_THRESHOLD1 (1 << 9) + +/* MISC_ENABLE bits: architectural */ +#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 +#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) +#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 +#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) +#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 +#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) +#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 +#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 +#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) + +/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ +#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 +#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) +#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 +#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) +#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 +#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) + +#define MSR_IA32_TSC_DEADLINE 0x000006E0 + +/* P4/Xeon+ specific */ +#define MSR_IA32_MCG_EAX 0x00000180 +#define MSR_IA32_MCG_EBX 0x00000181 +#define MSR_IA32_MCG_ECX 0x00000182 +#define MSR_IA32_MCG_EDX 0x00000183 +#define MSR_IA32_MCG_ESI 0x00000184 +#define MSR_IA32_MCG_EDI 0x00000185 +#define MSR_IA32_MCG_EBP 0x00000186 +#define MSR_IA32_MCG_ESP 0x00000187 +#define MSR_IA32_MCG_EFLAGS 0x00000188 +#define MSR_IA32_MCG_EIP 0x00000189 +#define MSR_IA32_MCG_RESERVED 0x0000018a + +/* Pentium IV performance counter MSRs */ +#define MSR_P4_BPU_PERFCTR0 0x00000300 +#define MSR_P4_BPU_PERFCTR1 0x00000301 +#define MSR_P4_BPU_PERFCTR2 0x00000302 +#define MSR_P4_BPU_PERFCTR3 0x00000303 +#define MSR_P4_MS_PERFCTR0 0x00000304 +#define MSR_P4_MS_PERFCTR1 0x00000305 +#define MSR_P4_MS_PERFCTR2 0x00000306 +#define MSR_P4_MS_PERFCTR3 0x00000307 +#define MSR_P4_FLAME_PERFCTR0 0x00000308 +#define MSR_P4_FLAME_PERFCTR1 0x00000309 +#define MSR_P4_FLAME_PERFCTR2 0x0000030a +#define MSR_P4_FLAME_PERFCTR3 0x0000030b +#define MSR_P4_IQ_PERFCTR0 0x0000030c +#define MSR_P4_IQ_PERFCTR1 0x0000030d +#define MSR_P4_IQ_PERFCTR2 0x0000030e +#define MSR_P4_IQ_PERFCTR3 0x0000030f +#define MSR_P4_IQ_PERFCTR4 0x00000310 +#define MSR_P4_IQ_PERFCTR5 0x00000311 +#define MSR_P4_BPU_CCCR0 0x00000360 +#define MSR_P4_BPU_CCCR1 0x00000361 +#define MSR_P4_BPU_CCCR2 0x00000362 +#define MSR_P4_BPU_CCCR3 0x00000363 +#define MSR_P4_MS_CCCR0 0x00000364 +#define MSR_P4_MS_CCCR1 0x00000365 +#define MSR_P4_MS_CCCR2 0x00000366 +#define MSR_P4_MS_CCCR3 0x00000367 +#define MSR_P4_FLAME_CCCR0 0x00000368 +#define MSR_P4_FLAME_CCCR1 0x00000369 +#define MSR_P4_FLAME_CCCR2 0x0000036a +#define MSR_P4_FLAME_CCCR3 0x0000036b +#define MSR_P4_IQ_CCCR0 0x0000036c +#define MSR_P4_IQ_CCCR1 0x0000036d +#define MSR_P4_IQ_CCCR2 0x0000036e +#define MSR_P4_IQ_CCCR3 0x0000036f +#define MSR_P4_IQ_CCCR4 0x00000370 +#define MSR_P4_IQ_CCCR5 0x00000371 +#define MSR_P4_ALF_ESCR0 0x000003ca +#define MSR_P4_ALF_ESCR1 0x000003cb +#define MSR_P4_BPU_ESCR0 0x000003b2 +#define MSR_P4_BPU_ESCR1 0x000003b3 +#define MSR_P4_BSU_ESCR0 0x000003a0 +#define MSR_P4_BSU_ESCR1 0x000003a1 +#define MSR_P4_CRU_ESCR0 0x000003b8 +#define MSR_P4_CRU_ESCR1 0x000003b9 +#define MSR_P4_CRU_ESCR2 0x000003cc +#define MSR_P4_CRU_ESCR3 0x000003cd +#define MSR_P4_CRU_ESCR4 0x000003e0 +#define MSR_P4_CRU_ESCR5 0x000003e1 +#define MSR_P4_DAC_ESCR0 0x000003a8 +#define MSR_P4_DAC_ESCR1 0x000003a9 +#define MSR_P4_FIRM_ESCR0 0x000003a4 +#define MSR_P4_FIRM_ESCR1 0x000003a5 +#define MSR_P4_FLAME_ESCR0 0x000003a6 +#define MSR_P4_FLAME_ESCR1 0x000003a7 +#define MSR_P4_FSB_ESCR0 0x000003a2 +#define MSR_P4_FSB_ESCR1 0x000003a3 +#define MSR_P4_IQ_ESCR0 0x000003ba +#define MSR_P4_IQ_ESCR1 0x000003bb +#define MSR_P4_IS_ESCR0 0x000003b4 +#define MSR_P4_IS_ESCR1 0x000003b5 +#define MSR_P4_ITLB_ESCR0 0x000003b6 +#define MSR_P4_ITLB_ESCR1 0x000003b7 +#define MSR_P4_IX_ESCR0 0x000003c8 +#define MSR_P4_IX_ESCR1 0x000003c9 +#define MSR_P4_MOB_ESCR0 0x000003aa +#define MSR_P4_MOB_ESCR1 0x000003ab +#define MSR_P4_MS_ESCR0 0x000003c0 +#define MSR_P4_MS_ESCR1 0x000003c1 +#define MSR_P4_PMH_ESCR0 0x000003ac +#define MSR_P4_PMH_ESCR1 0x000003ad +#define MSR_P4_RAT_ESCR0 0x000003bc +#define MSR_P4_RAT_ESCR1 0x000003bd +#define MSR_P4_SAAT_ESCR0 0x000003ae +#define MSR_P4_SAAT_ESCR1 0x000003af +#define MSR_P4_SSU_ESCR0 0x000003be +#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ + +#define MSR_P4_TBPU_ESCR0 0x000003c2 +#define MSR_P4_TBPU_ESCR1 0x000003c3 +#define MSR_P4_TC_ESCR0 0x000003c4 +#define MSR_P4_TC_ESCR1 0x000003c5 +#define MSR_P4_U2L_ESCR0 0x000003b0 +#define MSR_P4_U2L_ESCR1 0x000003b1 + +#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 + +/* Intel Core-based CPU performance counters */ +#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 +#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a +#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b +#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d +#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e +#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f +#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 + +/* Geode defined MSRs */ +#define MSR_GEODE_BUSCONT_CONF0 0x00001900 + +/* Intel VT MSRs */ +#define MSR_IA32_VMX_BASIC 0x00000480 +#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 +#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 +#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 +#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 +#define MSR_IA32_VMX_MISC 0x00000485 +#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 +#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 +#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 +#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 +#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a +#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b +#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c +#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d +#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e +#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f +#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 +#define MSR_IA32_VMX_VMFUNC 0x00000491 + +/* VMX_BASIC bits and bitmasks */ +#define VMX_BASIC_VMCS_SIZE_SHIFT 32 +#define VMX_BASIC_TRUE_CTLS (1ULL << 55) +#define VMX_BASIC_64 0x0001000000000000LLU +#define VMX_BASIC_MEM_TYPE_SHIFT 50 +#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU +#define VMX_BASIC_MEM_TYPE_WB 6LLU +#define VMX_BASIC_INOUT 0x0040000000000000LLU + +/* MSR_IA32_VMX_MISC bits */ +#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) +#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F +/* AMD-V MSRs */ + +#define MSR_VM_CR 0xc0010114 +#define MSR_VM_IGNNE 0xc0010115 +#define MSR_VM_HSAVE_PA 0xc0010117 + +#endif /* _UAPI_ASM_X86_MSR_INDEX_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: linux-arm-kernel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/x86/include/asm/msr-index.h | 694 +-------------------------------- arch/x86/include/uapi/asm/msr-index.h | 698 ++++++++++++++++++++++++++++++++++ 2 files changed, 699 insertions(+), 693 deletions(-) create mode 100644 arch/x86/include/uapi/asm/msr-index.h diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 710273c617b8..1baa0628da74 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -1,698 +1,6 @@ #ifndef _ASM_X86_MSR_INDEX_H #define _ASM_X86_MSR_INDEX_H -/* - * CPU model specific register (MSR) numbers. - * - * Do not add new entries to this file unless the definitions are shared - * between multiple compilation units. - */ - -/* x86-64 specific MSRs */ -#define MSR_EFER 0xc0000080 /* extended feature register */ -#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ -#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ -#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ -#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ -#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ -#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ -#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ -#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ - -/* EFER bits: */ -#define _EFER_SCE 0 /* SYSCALL/SYSRET */ -#define _EFER_LME 8 /* Long mode enable */ -#define _EFER_LMA 10 /* Long mode active (read-only) */ -#define _EFER_NX 11 /* No execute enable */ -#define _EFER_SVME 12 /* Enable virtualization */ -#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ -#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ - -#define EFER_SCE (1<<_EFER_SCE) -#define EFER_LME (1<<_EFER_LME) -#define EFER_LMA (1<<_EFER_LMA) -#define EFER_NX (1<<_EFER_NX) -#define EFER_SVME (1<<_EFER_SVME) -#define EFER_LMSLE (1<<_EFER_LMSLE) -#define EFER_FFXSR (1<<_EFER_FFXSR) - -/* Intel MSRs. Some also available on other CPUs */ - -#define MSR_PPIN_CTL 0x0000004e -#define MSR_PPIN 0x0000004f - -#define MSR_IA32_PERFCTR0 0x000000c1 -#define MSR_IA32_PERFCTR1 0x000000c2 -#define MSR_FSB_FREQ 0x000000cd -#define MSR_PLATFORM_INFO 0x000000ce - -#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 -#define NHM_C3_AUTO_DEMOTE (1UL << 25) -#define NHM_C1_AUTO_DEMOTE (1UL << 26) -#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) -#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) -#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) - -#define MSR_MTRRcap 0x000000fe -#define MSR_IA32_BBL_CR_CTL 0x00000119 -#define MSR_IA32_BBL_CR_CTL3 0x0000011e - -#define MSR_IA32_SYSENTER_CS 0x00000174 -#define MSR_IA32_SYSENTER_ESP 0x00000175 -#define MSR_IA32_SYSENTER_EIP 0x00000176 - -#define MSR_IA32_MCG_CAP 0x00000179 -#define MSR_IA32_MCG_STATUS 0x0000017a -#define MSR_IA32_MCG_CTL 0x0000017b -#define MSR_IA32_MCG_EXT_CTL 0x000004d0 - -#define MSR_OFFCORE_RSP_0 0x000001a6 -#define MSR_OFFCORE_RSP_1 0x000001a7 -#define MSR_TURBO_RATIO_LIMIT 0x000001ad -#define MSR_TURBO_RATIO_LIMIT1 0x000001ae -#define MSR_TURBO_RATIO_LIMIT2 0x000001af - -#define MSR_LBR_SELECT 0x000001c8 -#define MSR_LBR_TOS 0x000001c9 -#define MSR_LBR_NHM_FROM 0x00000680 -#define MSR_LBR_NHM_TO 0x000006c0 -#define MSR_LBR_CORE_FROM 0x00000040 -#define MSR_LBR_CORE_TO 0x00000060 - -#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ -#define LBR_INFO_MISPRED BIT_ULL(63) -#define LBR_INFO_IN_TX BIT_ULL(62) -#define LBR_INFO_ABORT BIT_ULL(61) -#define LBR_INFO_CYCLES 0xffff - -#define MSR_IA32_PEBS_ENABLE 0x000003f1 -#define MSR_IA32_DS_AREA 0x00000600 -#define MSR_IA32_PERF_CAPABILITIES 0x00000345 -#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 - -#define MSR_IA32_RTIT_CTL 0x00000570 -#define MSR_IA32_RTIT_STATUS 0x00000571 -#define MSR_IA32_RTIT_ADDR0_A 0x00000580 -#define MSR_IA32_RTIT_ADDR0_B 0x00000581 -#define MSR_IA32_RTIT_ADDR1_A 0x00000582 -#define MSR_IA32_RTIT_ADDR1_B 0x00000583 -#define MSR_IA32_RTIT_ADDR2_A 0x00000584 -#define MSR_IA32_RTIT_ADDR2_B 0x00000585 -#define MSR_IA32_RTIT_ADDR3_A 0x00000586 -#define MSR_IA32_RTIT_ADDR3_B 0x00000587 -#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 -#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 -#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 - -#define MSR_MTRRfix64K_00000 0x00000250 -#define MSR_MTRRfix16K_80000 0x00000258 -#define MSR_MTRRfix16K_A0000 0x00000259 -#define MSR_MTRRfix4K_C0000 0x00000268 -#define MSR_MTRRfix4K_C8000 0x00000269 -#define MSR_MTRRfix4K_D0000 0x0000026a -#define MSR_MTRRfix4K_D8000 0x0000026b -#define MSR_MTRRfix4K_E0000 0x0000026c -#define MSR_MTRRfix4K_E8000 0x0000026d -#define MSR_MTRRfix4K_F0000 0x0000026e -#define MSR_MTRRfix4K_F8000 0x0000026f -#define MSR_MTRRdefType 0x000002ff - -#define MSR_IA32_CR_PAT 0x00000277 - -#define MSR_IA32_DEBUGCTLMSR 0x000001d9 -#define MSR_IA32_LASTBRANCHFROMIP 0x000001db -#define MSR_IA32_LASTBRANCHTOIP 0x000001dc -#define MSR_IA32_LASTINTFROMIP 0x000001dd -#define MSR_IA32_LASTINTTOIP 0x000001de - -/* DEBUGCTLMSR bits (others vary by model): */ -#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ -#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ -#define DEBUGCTLMSR_TR (1UL << 6) -#define DEBUGCTLMSR_BTS (1UL << 7) -#define DEBUGCTLMSR_BTINT (1UL << 8) -#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) -#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) -#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) - -#define MSR_PEBS_FRONTEND 0x000003f7 - -#define MSR_IA32_POWER_CTL 0x000001fc - -#define MSR_IA32_MC0_CTL 0x00000400 -#define MSR_IA32_MC0_STATUS 0x00000401 -#define MSR_IA32_MC0_ADDR 0x00000402 -#define MSR_IA32_MC0_MISC 0x00000403 - -/* C-state Residency Counters */ -#define MSR_PKG_C3_RESIDENCY 0x000003f8 -#define MSR_PKG_C6_RESIDENCY 0x000003f9 -#define MSR_PKG_C7_RESIDENCY 0x000003fa -#define MSR_CORE_C3_RESIDENCY 0x000003fc -#define MSR_CORE_C6_RESIDENCY 0x000003fd -#define MSR_CORE_C7_RESIDENCY 0x000003fe -#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff -#define MSR_PKG_C2_RESIDENCY 0x0000060d -#define MSR_PKG_C8_RESIDENCY 0x00000630 -#define MSR_PKG_C9_RESIDENCY 0x00000631 -#define MSR_PKG_C10_RESIDENCY 0x00000632 - -/* Interrupt Response Limit */ -#define MSR_PKGC3_IRTL 0x0000060a -#define MSR_PKGC6_IRTL 0x0000060b -#define MSR_PKGC7_IRTL 0x0000060c -#define MSR_PKGC8_IRTL 0x00000633 -#define MSR_PKGC9_IRTL 0x00000634 -#define MSR_PKGC10_IRTL 0x00000635 - -/* Run Time Average Power Limiting (RAPL) Interface */ - -#define MSR_RAPL_POWER_UNIT 0x00000606 - -#define MSR_PKG_POWER_LIMIT 0x00000610 -#define MSR_PKG_ENERGY_STATUS 0x00000611 -#define MSR_PKG_PERF_STATUS 0x00000613 -#define MSR_PKG_POWER_INFO 0x00000614 - -#define MSR_DRAM_POWER_LIMIT 0x00000618 -#define MSR_DRAM_ENERGY_STATUS 0x00000619 -#define MSR_DRAM_PERF_STATUS 0x0000061b -#define MSR_DRAM_POWER_INFO 0x0000061c - -#define MSR_PP0_POWER_LIMIT 0x00000638 -#define MSR_PP0_ENERGY_STATUS 0x00000639 -#define MSR_PP0_POLICY 0x0000063a -#define MSR_PP0_PERF_STATUS 0x0000063b - -#define MSR_PP1_POWER_LIMIT 0x00000640 -#define MSR_PP1_ENERGY_STATUS 0x00000641 -#define MSR_PP1_POLICY 0x00000642 - -/* Config TDP MSRs */ -#define MSR_CONFIG_TDP_NOMINAL 0x00000648 -#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 -#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A -#define MSR_CONFIG_TDP_CONTROL 0x0000064B -#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C - -#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D - -#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 -#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 -#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A -#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B - -#define MSR_CORE_C1_RES 0x00000660 - -#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 -#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 - -#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 -#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 -#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 - -/* Hardware P state interface */ -#define MSR_PPERF 0x0000064e -#define MSR_PERF_LIMIT_REASONS 0x0000064f -#define MSR_PM_ENABLE 0x00000770 -#define MSR_HWP_CAPABILITIES 0x00000771 -#define MSR_HWP_REQUEST_PKG 0x00000772 -#define MSR_HWP_INTERRUPT 0x00000773 -#define MSR_HWP_REQUEST 0x00000774 -#define MSR_HWP_STATUS 0x00000777 - -/* CPUID.6.EAX */ -#define HWP_BASE_BIT (1<<7) -#define HWP_NOTIFICATIONS_BIT (1<<8) -#define HWP_ACTIVITY_WINDOW_BIT (1<<9) -#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) -#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) - -/* IA32_HWP_CAPABILITIES */ -#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) -#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) -#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) -#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) - -/* IA32_HWP_REQUEST */ -#define HWP_MIN_PERF(x) (x & 0xff) -#define HWP_MAX_PERF(x) ((x & 0xff) << 8) -#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) -#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) -#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) -#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) - -/* IA32_HWP_STATUS */ -#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) - -/* IA32_HWP_INTERRUPT */ -#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) - -#define MSR_AMD64_MC0_MASK 0xc0010044 - -#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) -#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) -#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) -#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) - -#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) - -/* These are consecutive and not in the normal 4er MCE bank block */ -#define MSR_IA32_MC0_CTL2 0x00000280 -#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) - -#define MSR_P6_PERFCTR0 0x000000c1 -#define MSR_P6_PERFCTR1 0x000000c2 -#define MSR_P6_EVNTSEL0 0x00000186 -#define MSR_P6_EVNTSEL1 0x00000187 - -#define MSR_KNC_PERFCTR0 0x00000020 -#define MSR_KNC_PERFCTR1 0x00000021 -#define MSR_KNC_EVNTSEL0 0x00000028 -#define MSR_KNC_EVNTSEL1 0x00000029 - -/* Alternative perfctr range with full access. */ -#define MSR_IA32_PMC0 0x000004c1 - -/* AMD64 MSRs. Not complete. See the architecture manual for a more - complete list. */ - -#define MSR_AMD64_PATCH_LEVEL 0x0000008b -#define MSR_AMD64_TSC_RATIO 0xc0000104 -#define MSR_AMD64_NB_CFG 0xc001001f -#define MSR_AMD64_PATCH_LOADER 0xc0010020 -#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 -#define MSR_AMD64_OSVW_STATUS 0xc0010141 -#define MSR_AMD64_LS_CFG 0xc0011020 -#define MSR_AMD64_DC_CFG 0xc0011022 -#define MSR_AMD64_BU_CFG2 0xc001102a -#define MSR_AMD64_IBSFETCHCTL 0xc0011030 -#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 -#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 -#define MSR_AMD64_IBSFETCH_REG_COUNT 3 -#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) -#define MSR_AMD64_IBSOPCTL 0xc0011033 -#define MSR_AMD64_IBSOPRIP 0xc0011034 -#define MSR_AMD64_IBSOPDATA 0xc0011035 -#define MSR_AMD64_IBSOPDATA2 0xc0011036 -#define MSR_AMD64_IBSOPDATA3 0xc0011037 -#define MSR_AMD64_IBSDCLINAD 0xc0011038 -#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 -#define MSR_AMD64_IBSOP_REG_COUNT 7 -#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) -#define MSR_AMD64_IBSCTL 0xc001103a -#define MSR_AMD64_IBSBRTARGET 0xc001103b -#define MSR_AMD64_IBSOPDATA4 0xc001103d -#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ - -/* Fam 17h MSRs */ -#define MSR_F17H_IRPERF 0xc00000e9 - -/* Fam 16h MSRs */ -#define MSR_F16H_L2I_PERF_CTL 0xc0010230 -#define MSR_F16H_L2I_PERF_CTR 0xc0010231 -#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 -#define MSR_F16H_DR2_ADDR_MASK 0xc001101a -#define MSR_F16H_DR3_ADDR_MASK 0xc001101b -#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 - -/* Fam 15h MSRs */ -#define MSR_F15H_PERF_CTL 0xc0010200 -#define MSR_F15H_PERF_CTR 0xc0010201 -#define MSR_F15H_NB_PERF_CTL 0xc0010240 -#define MSR_F15H_NB_PERF_CTR 0xc0010241 -#define MSR_F15H_PTSC 0xc0010280 -#define MSR_F15H_IC_CFG 0xc0011021 - -/* Fam 10h MSRs */ -#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 -#define FAM10H_MMIO_CONF_ENABLE (1<<0) -#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf -#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 -#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL -#define FAM10H_MMIO_CONF_BASE_SHIFT 20 -#define MSR_FAM10H_NODE_ID 0xc001100c - -/* K8 MSRs */ -#define MSR_K8_TOP_MEM1 0xc001001a -#define MSR_K8_TOP_MEM2 0xc001001d -#define MSR_K8_SYSCFG 0xc0010010 -#define MSR_K8_INT_PENDING_MSG 0xc0010055 -/* C1E active bits in int pending message */ -#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 -#define MSR_K8_TSEG_ADDR 0xc0010112 -#define MSR_K8_TSEG_MASK 0xc0010113 -#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ -#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ -#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ - -/* K7 MSRs */ -#define MSR_K7_EVNTSEL0 0xc0010000 -#define MSR_K7_PERFCTR0 0xc0010004 -#define MSR_K7_EVNTSEL1 0xc0010001 -#define MSR_K7_PERFCTR1 0xc0010005 -#define MSR_K7_EVNTSEL2 0xc0010002 -#define MSR_K7_PERFCTR2 0xc0010006 -#define MSR_K7_EVNTSEL3 0xc0010003 -#define MSR_K7_PERFCTR3 0xc0010007 -#define MSR_K7_CLK_CTL 0xc001001b -#define MSR_K7_HWCR 0xc0010015 -#define MSR_K7_FID_VID_CTL 0xc0010041 -#define MSR_K7_FID_VID_STATUS 0xc0010042 - -/* K6 MSRs */ -#define MSR_K6_WHCR 0xc0000082 -#define MSR_K6_UWCCR 0xc0000085 -#define MSR_K6_EPMR 0xc0000086 -#define MSR_K6_PSOR 0xc0000087 -#define MSR_K6_PFIR 0xc0000088 - -/* Centaur-Hauls/IDT defined MSRs. */ -#define MSR_IDT_FCR1 0x00000107 -#define MSR_IDT_FCR2 0x00000108 -#define MSR_IDT_FCR3 0x00000109 -#define MSR_IDT_FCR4 0x0000010a - -#define MSR_IDT_MCR0 0x00000110 -#define MSR_IDT_MCR1 0x00000111 -#define MSR_IDT_MCR2 0x00000112 -#define MSR_IDT_MCR3 0x00000113 -#define MSR_IDT_MCR4 0x00000114 -#define MSR_IDT_MCR5 0x00000115 -#define MSR_IDT_MCR6 0x00000116 -#define MSR_IDT_MCR7 0x00000117 -#define MSR_IDT_MCR_CTRL 0x00000120 - -/* VIA Cyrix defined MSRs*/ -#define MSR_VIA_FCR 0x00001107 -#define MSR_VIA_LONGHAUL 0x0000110a -#define MSR_VIA_RNG 0x0000110b -#define MSR_VIA_BCR2 0x00001147 - -/* Transmeta defined MSRs */ -#define MSR_TMTA_LONGRUN_CTRL 0x80868010 -#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 -#define MSR_TMTA_LRTI_READOUT 0x80868018 -#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a - -/* Intel defined MSRs. */ -#define MSR_IA32_P5_MC_ADDR 0x00000000 -#define MSR_IA32_P5_MC_TYPE 0x00000001 -#define MSR_IA32_TSC 0x00000010 -#define MSR_IA32_PLATFORM_ID 0x00000017 -#define MSR_IA32_EBL_CR_POWERON 0x0000002a -#define MSR_EBC_FREQUENCY_ID 0x0000002c -#define MSR_SMI_COUNT 0x00000034 -#define MSR_IA32_FEATURE_CONTROL 0x0000003a -#define MSR_IA32_TSC_ADJUST 0x0000003b -#define MSR_IA32_BNDCFGS 0x00000d90 - -#define MSR_IA32_XSS 0x00000da0 - -#define FEATURE_CONTROL_LOCKED (1<<0) -#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) -#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) -#define FEATURE_CONTROL_LMCE (1<<20) - -#define MSR_IA32_APICBASE 0x0000001b -#define MSR_IA32_APICBASE_BSP (1<<8) -#define MSR_IA32_APICBASE_ENABLE (1<<11) -#define MSR_IA32_APICBASE_BASE (0xfffff<<12) - -#define MSR_IA32_TSCDEADLINE 0x000006e0 - -#define MSR_IA32_UCODE_WRITE 0x00000079 -#define MSR_IA32_UCODE_REV 0x0000008b - -#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b -#define MSR_IA32_SMBASE 0x0000009e - -#define MSR_IA32_PERF_STATUS 0x00000198 -#define MSR_IA32_PERF_CTL 0x00000199 -#define INTEL_PERF_CTL_MASK 0xffff -#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 -#define MSR_AMD_PERF_STATUS 0xc0010063 -#define MSR_AMD_PERF_CTL 0xc0010062 - -#define MSR_IA32_MPERF 0x000000e7 -#define MSR_IA32_APERF 0x000000e8 - -#define MSR_IA32_THERM_CONTROL 0x0000019a -#define MSR_IA32_THERM_INTERRUPT 0x0000019b - -#define THERM_INT_HIGH_ENABLE (1 << 0) -#define THERM_INT_LOW_ENABLE (1 << 1) -#define THERM_INT_PLN_ENABLE (1 << 24) - -#define MSR_IA32_THERM_STATUS 0x0000019c - -#define THERM_STATUS_PROCHOT (1 << 0) -#define THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_THERM2_CTL 0x0000019d - -#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) - -#define MSR_IA32_MISC_ENABLE 0x000001a0 - -#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 - -#define MSR_MISC_PWR_MGMT 0x000001aa - -#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 -#define ENERGY_PERF_BIAS_PERFORMANCE 0 -#define ENERGY_PERF_BIAS_NORMAL 6 -#define ENERGY_PERF_BIAS_POWERSAVE 15 - -#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 - -#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) -#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 - -#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) -#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) -#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) - -/* Thermal Thresholds Support */ -#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) -#define THERM_SHIFT_THRESHOLD0 8 -#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) -#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) -#define THERM_SHIFT_THRESHOLD1 16 -#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) -#define THERM_STATUS_THRESHOLD0 (1 << 6) -#define THERM_LOG_THRESHOLD0 (1 << 7) -#define THERM_STATUS_THRESHOLD1 (1 << 8) -#define THERM_LOG_THRESHOLD1 (1 << 9) - -/* MISC_ENABLE bits: architectural */ -#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 -#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) -#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 -#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) -#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 -#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) -#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 -#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 -#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) - -/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ -#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 -#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) -#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 -#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) -#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 -#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) - -#define MSR_IA32_TSC_DEADLINE 0x000006E0 - -/* P4/Xeon+ specific */ -#define MSR_IA32_MCG_EAX 0x00000180 -#define MSR_IA32_MCG_EBX 0x00000181 -#define MSR_IA32_MCG_ECX 0x00000182 -#define MSR_IA32_MCG_EDX 0x00000183 -#define MSR_IA32_MCG_ESI 0x00000184 -#define MSR_IA32_MCG_EDI 0x00000185 -#define MSR_IA32_MCG_EBP 0x00000186 -#define MSR_IA32_MCG_ESP 0x00000187 -#define MSR_IA32_MCG_EFLAGS 0x00000188 -#define MSR_IA32_MCG_EIP 0x00000189 -#define MSR_IA32_MCG_RESERVED 0x0000018a - -/* Pentium IV performance counter MSRs */ -#define MSR_P4_BPU_PERFCTR0 0x00000300 -#define MSR_P4_BPU_PERFCTR1 0x00000301 -#define MSR_P4_BPU_PERFCTR2 0x00000302 -#define MSR_P4_BPU_PERFCTR3 0x00000303 -#define MSR_P4_MS_PERFCTR0 0x00000304 -#define MSR_P4_MS_PERFCTR1 0x00000305 -#define MSR_P4_MS_PERFCTR2 0x00000306 -#define MSR_P4_MS_PERFCTR3 0x00000307 -#define MSR_P4_FLAME_PERFCTR0 0x00000308 -#define MSR_P4_FLAME_PERFCTR1 0x00000309 -#define MSR_P4_FLAME_PERFCTR2 0x0000030a -#define MSR_P4_FLAME_PERFCTR3 0x0000030b -#define MSR_P4_IQ_PERFCTR0 0x0000030c -#define MSR_P4_IQ_PERFCTR1 0x0000030d -#define MSR_P4_IQ_PERFCTR2 0x0000030e -#define MSR_P4_IQ_PERFCTR3 0x0000030f -#define MSR_P4_IQ_PERFCTR4 0x00000310 -#define MSR_P4_IQ_PERFCTR5 0x00000311 -#define MSR_P4_BPU_CCCR0 0x00000360 -#define MSR_P4_BPU_CCCR1 0x00000361 -#define MSR_P4_BPU_CCCR2 0x00000362 -#define MSR_P4_BPU_CCCR3 0x00000363 -#define MSR_P4_MS_CCCR0 0x00000364 -#define MSR_P4_MS_CCCR1 0x00000365 -#define MSR_P4_MS_CCCR2 0x00000366 -#define MSR_P4_MS_CCCR3 0x00000367 -#define MSR_P4_FLAME_CCCR0 0x00000368 -#define MSR_P4_FLAME_CCCR1 0x00000369 -#define MSR_P4_FLAME_CCCR2 0x0000036a -#define MSR_P4_FLAME_CCCR3 0x0000036b -#define MSR_P4_IQ_CCCR0 0x0000036c -#define MSR_P4_IQ_CCCR1 0x0000036d -#define MSR_P4_IQ_CCCR2 0x0000036e -#define MSR_P4_IQ_CCCR3 0x0000036f -#define MSR_P4_IQ_CCCR4 0x00000370 -#define MSR_P4_IQ_CCCR5 0x00000371 -#define MSR_P4_ALF_ESCR0 0x000003ca -#define MSR_P4_ALF_ESCR1 0x000003cb -#define MSR_P4_BPU_ESCR0 0x000003b2 -#define MSR_P4_BPU_ESCR1 0x000003b3 -#define MSR_P4_BSU_ESCR0 0x000003a0 -#define MSR_P4_BSU_ESCR1 0x000003a1 -#define MSR_P4_CRU_ESCR0 0x000003b8 -#define MSR_P4_CRU_ESCR1 0x000003b9 -#define MSR_P4_CRU_ESCR2 0x000003cc -#define MSR_P4_CRU_ESCR3 0x000003cd -#define MSR_P4_CRU_ESCR4 0x000003e0 -#define MSR_P4_CRU_ESCR5 0x000003e1 -#define MSR_P4_DAC_ESCR0 0x000003a8 -#define MSR_P4_DAC_ESCR1 0x000003a9 -#define MSR_P4_FIRM_ESCR0 0x000003a4 -#define MSR_P4_FIRM_ESCR1 0x000003a5 -#define MSR_P4_FLAME_ESCR0 0x000003a6 -#define MSR_P4_FLAME_ESCR1 0x000003a7 -#define MSR_P4_FSB_ESCR0 0x000003a2 -#define MSR_P4_FSB_ESCR1 0x000003a3 -#define MSR_P4_IQ_ESCR0 0x000003ba -#define MSR_P4_IQ_ESCR1 0x000003bb -#define MSR_P4_IS_ESCR0 0x000003b4 -#define MSR_P4_IS_ESCR1 0x000003b5 -#define MSR_P4_ITLB_ESCR0 0x000003b6 -#define MSR_P4_ITLB_ESCR1 0x000003b7 -#define MSR_P4_IX_ESCR0 0x000003c8 -#define MSR_P4_IX_ESCR1 0x000003c9 -#define MSR_P4_MOB_ESCR0 0x000003aa -#define MSR_P4_MOB_ESCR1 0x000003ab -#define MSR_P4_MS_ESCR0 0x000003c0 -#define MSR_P4_MS_ESCR1 0x000003c1 -#define MSR_P4_PMH_ESCR0 0x000003ac -#define MSR_P4_PMH_ESCR1 0x000003ad -#define MSR_P4_RAT_ESCR0 0x000003bc -#define MSR_P4_RAT_ESCR1 0x000003bd -#define MSR_P4_SAAT_ESCR0 0x000003ae -#define MSR_P4_SAAT_ESCR1 0x000003af -#define MSR_P4_SSU_ESCR0 0x000003be -#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ - -#define MSR_P4_TBPU_ESCR0 0x000003c2 -#define MSR_P4_TBPU_ESCR1 0x000003c3 -#define MSR_P4_TC_ESCR0 0x000003c4 -#define MSR_P4_TC_ESCR1 0x000003c5 -#define MSR_P4_U2L_ESCR0 0x000003b0 -#define MSR_P4_U2L_ESCR1 0x000003b1 - -#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 - -/* Intel Core-based CPU performance counters */ -#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 -#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a -#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b -#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d -#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e -#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f -#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 - -/* Geode defined MSRs */ -#define MSR_GEODE_BUSCONT_CONF0 0x00001900 - -/* Intel VT MSRs */ -#define MSR_IA32_VMX_BASIC 0x00000480 -#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 -#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 -#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 -#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 -#define MSR_IA32_VMX_MISC 0x00000485 -#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 -#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 -#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 -#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 -#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a -#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b -#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c -#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d -#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e -#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f -#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 -#define MSR_IA32_VMX_VMFUNC 0x00000491 - -/* VMX_BASIC bits and bitmasks */ -#define VMX_BASIC_VMCS_SIZE_SHIFT 32 -#define VMX_BASIC_TRUE_CTLS (1ULL << 55) -#define VMX_BASIC_64 0x0001000000000000LLU -#define VMX_BASIC_MEM_TYPE_SHIFT 50 -#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU -#define VMX_BASIC_MEM_TYPE_WB 6LLU -#define VMX_BASIC_INOUT 0x0040000000000000LLU - -/* MSR_IA32_VMX_MISC bits */ -#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) -#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F -/* AMD-V MSRs */ - -#define MSR_VM_CR 0xc0010114 -#define MSR_VM_IGNNE 0xc0010115 -#define MSR_VM_HSAVE_PA 0xc0010117 +#include <uapi/asm/msr-index.h> #endif /* _ASM_X86_MSR_INDEX_H */ diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h new file mode 100644 index 000000000000..d097e832ee3c --- /dev/null +++ b/arch/x86/include/uapi/asm/msr-index.h @@ -0,0 +1,698 @@ +#ifndef _UAPI_ASM_X86_MSR_INDEX_H +#define _UAPI_ASM_X86_MSR_INDEX_H + +/* + * CPU model specific register (MSR) numbers. + * + * Do not add new entries to this file unless the definitions are shared + * between multiple compilation units. + */ + +/* x86-64 specific MSRs */ +#define MSR_EFER 0xc0000080 /* extended feature register */ +#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ +#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ +#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ +#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ +#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ +#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ +#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ +#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ + +/* EFER bits: */ +#define _EFER_SCE 0 /* SYSCALL/SYSRET */ +#define _EFER_LME 8 /* Long mode enable */ +#define _EFER_LMA 10 /* Long mode active (read-only) */ +#define _EFER_NX 11 /* No execute enable */ +#define _EFER_SVME 12 /* Enable virtualization */ +#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ +#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ + +#define EFER_SCE (1<<_EFER_SCE) +#define EFER_LME (1<<_EFER_LME) +#define EFER_LMA (1<<_EFER_LMA) +#define EFER_NX (1<<_EFER_NX) +#define EFER_SVME (1<<_EFER_SVME) +#define EFER_LMSLE (1<<_EFER_LMSLE) +#define EFER_FFXSR (1<<_EFER_FFXSR) + +/* Intel MSRs. Some also available on other CPUs */ + +#define MSR_PPIN_CTL 0x0000004e +#define MSR_PPIN 0x0000004f + +#define MSR_IA32_PERFCTR0 0x000000c1 +#define MSR_IA32_PERFCTR1 0x000000c2 +#define MSR_FSB_FREQ 0x000000cd +#define MSR_PLATFORM_INFO 0x000000ce + +#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 +#define NHM_C3_AUTO_DEMOTE (1UL << 25) +#define NHM_C1_AUTO_DEMOTE (1UL << 26) +#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) +#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) +#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) + +#define MSR_MTRRcap 0x000000fe +#define MSR_IA32_BBL_CR_CTL 0x00000119 +#define MSR_IA32_BBL_CR_CTL3 0x0000011e + +#define MSR_IA32_SYSENTER_CS 0x00000174 +#define MSR_IA32_SYSENTER_ESP 0x00000175 +#define MSR_IA32_SYSENTER_EIP 0x00000176 + +#define MSR_IA32_MCG_CAP 0x00000179 +#define MSR_IA32_MCG_STATUS 0x0000017a +#define MSR_IA32_MCG_CTL 0x0000017b +#define MSR_IA32_MCG_EXT_CTL 0x000004d0 + +#define MSR_OFFCORE_RSP_0 0x000001a6 +#define MSR_OFFCORE_RSP_1 0x000001a7 +#define MSR_TURBO_RATIO_LIMIT 0x000001ad +#define MSR_TURBO_RATIO_LIMIT1 0x000001ae +#define MSR_TURBO_RATIO_LIMIT2 0x000001af + +#define MSR_LBR_SELECT 0x000001c8 +#define MSR_LBR_TOS 0x000001c9 +#define MSR_LBR_NHM_FROM 0x00000680 +#define MSR_LBR_NHM_TO 0x000006c0 +#define MSR_LBR_CORE_FROM 0x00000040 +#define MSR_LBR_CORE_TO 0x00000060 + +#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ +#define LBR_INFO_MISPRED BIT_ULL(63) +#define LBR_INFO_IN_TX BIT_ULL(62) +#define LBR_INFO_ABORT BIT_ULL(61) +#define LBR_INFO_CYCLES 0xffff + +#define MSR_IA32_PEBS_ENABLE 0x000003f1 +#define MSR_IA32_DS_AREA 0x00000600 +#define MSR_IA32_PERF_CAPABILITIES 0x00000345 +#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 + +#define MSR_IA32_RTIT_CTL 0x00000570 +#define MSR_IA32_RTIT_STATUS 0x00000571 +#define MSR_IA32_RTIT_ADDR0_A 0x00000580 +#define MSR_IA32_RTIT_ADDR0_B 0x00000581 +#define MSR_IA32_RTIT_ADDR1_A 0x00000582 +#define MSR_IA32_RTIT_ADDR1_B 0x00000583 +#define MSR_IA32_RTIT_ADDR2_A 0x00000584 +#define MSR_IA32_RTIT_ADDR2_B 0x00000585 +#define MSR_IA32_RTIT_ADDR3_A 0x00000586 +#define MSR_IA32_RTIT_ADDR3_B 0x00000587 +#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 +#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 +#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 + +#define MSR_MTRRfix64K_00000 0x00000250 +#define MSR_MTRRfix16K_80000 0x00000258 +#define MSR_MTRRfix16K_A0000 0x00000259 +#define MSR_MTRRfix4K_C0000 0x00000268 +#define MSR_MTRRfix4K_C8000 0x00000269 +#define MSR_MTRRfix4K_D0000 0x0000026a +#define MSR_MTRRfix4K_D8000 0x0000026b +#define MSR_MTRRfix4K_E0000 0x0000026c +#define MSR_MTRRfix4K_E8000 0x0000026d +#define MSR_MTRRfix4K_F0000 0x0000026e +#define MSR_MTRRfix4K_F8000 0x0000026f +#define MSR_MTRRdefType 0x000002ff + +#define MSR_IA32_CR_PAT 0x00000277 + +#define MSR_IA32_DEBUGCTLMSR 0x000001d9 +#define MSR_IA32_LASTBRANCHFROMIP 0x000001db +#define MSR_IA32_LASTBRANCHTOIP 0x000001dc +#define MSR_IA32_LASTINTFROMIP 0x000001dd +#define MSR_IA32_LASTINTTOIP 0x000001de + +/* DEBUGCTLMSR bits (others vary by model): */ +#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ +#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ +#define DEBUGCTLMSR_TR (1UL << 6) +#define DEBUGCTLMSR_BTS (1UL << 7) +#define DEBUGCTLMSR_BTINT (1UL << 8) +#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) +#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) +#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) + +#define MSR_PEBS_FRONTEND 0x000003f7 + +#define MSR_IA32_POWER_CTL 0x000001fc + +#define MSR_IA32_MC0_CTL 0x00000400 +#define MSR_IA32_MC0_STATUS 0x00000401 +#define MSR_IA32_MC0_ADDR 0x00000402 +#define MSR_IA32_MC0_MISC 0x00000403 + +/* C-state Residency Counters */ +#define MSR_PKG_C3_RESIDENCY 0x000003f8 +#define MSR_PKG_C6_RESIDENCY 0x000003f9 +#define MSR_PKG_C7_RESIDENCY 0x000003fa +#define MSR_CORE_C3_RESIDENCY 0x000003fc +#define MSR_CORE_C6_RESIDENCY 0x000003fd +#define MSR_CORE_C7_RESIDENCY 0x000003fe +#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff +#define MSR_PKG_C2_RESIDENCY 0x0000060d +#define MSR_PKG_C8_RESIDENCY 0x00000630 +#define MSR_PKG_C9_RESIDENCY 0x00000631 +#define MSR_PKG_C10_RESIDENCY 0x00000632 + +/* Interrupt Response Limit */ +#define MSR_PKGC3_IRTL 0x0000060a +#define MSR_PKGC6_IRTL 0x0000060b +#define MSR_PKGC7_IRTL 0x0000060c +#define MSR_PKGC8_IRTL 0x00000633 +#define MSR_PKGC9_IRTL 0x00000634 +#define MSR_PKGC10_IRTL 0x00000635 + +/* Run Time Average Power Limiting (RAPL) Interface */ + +#define MSR_RAPL_POWER_UNIT 0x00000606 + +#define MSR_PKG_POWER_LIMIT 0x00000610 +#define MSR_PKG_ENERGY_STATUS 0x00000611 +#define MSR_PKG_PERF_STATUS 0x00000613 +#define MSR_PKG_POWER_INFO 0x00000614 + +#define MSR_DRAM_POWER_LIMIT 0x00000618 +#define MSR_DRAM_ENERGY_STATUS 0x00000619 +#define MSR_DRAM_PERF_STATUS 0x0000061b +#define MSR_DRAM_POWER_INFO 0x0000061c + +#define MSR_PP0_POWER_LIMIT 0x00000638 +#define MSR_PP0_ENERGY_STATUS 0x00000639 +#define MSR_PP0_POLICY 0x0000063a +#define MSR_PP0_PERF_STATUS 0x0000063b + +#define MSR_PP1_POWER_LIMIT 0x00000640 +#define MSR_PP1_ENERGY_STATUS 0x00000641 +#define MSR_PP1_POLICY 0x00000642 + +/* Config TDP MSRs */ +#define MSR_CONFIG_TDP_NOMINAL 0x00000648 +#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 +#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A +#define MSR_CONFIG_TDP_CONTROL 0x0000064B +#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C + +#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D + +#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 +#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 +#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A +#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B + +#define MSR_CORE_C1_RES 0x00000660 + +#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 +#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 + +#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 +#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 +#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 + +/* Hardware P state interface */ +#define MSR_PPERF 0x0000064e +#define MSR_PERF_LIMIT_REASONS 0x0000064f +#define MSR_PM_ENABLE 0x00000770 +#define MSR_HWP_CAPABILITIES 0x00000771 +#define MSR_HWP_REQUEST_PKG 0x00000772 +#define MSR_HWP_INTERRUPT 0x00000773 +#define MSR_HWP_REQUEST 0x00000774 +#define MSR_HWP_STATUS 0x00000777 + +/* CPUID.6.EAX */ +#define HWP_BASE_BIT (1<<7) +#define HWP_NOTIFICATIONS_BIT (1<<8) +#define HWP_ACTIVITY_WINDOW_BIT (1<<9) +#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) +#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) + +/* IA32_HWP_CAPABILITIES */ +#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) +#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) +#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) +#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) + +/* IA32_HWP_REQUEST */ +#define HWP_MIN_PERF(x) (x & 0xff) +#define HWP_MAX_PERF(x) ((x & 0xff) << 8) +#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) +#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) +#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) +#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) + +/* IA32_HWP_STATUS */ +#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) + +/* IA32_HWP_INTERRUPT */ +#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) + +#define MSR_AMD64_MC0_MASK 0xc0010044 + +#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) +#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) +#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) +#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) + +#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) + +/* These are consecutive and not in the normal 4er MCE bank block */ +#define MSR_IA32_MC0_CTL2 0x00000280 +#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) + +#define MSR_P6_PERFCTR0 0x000000c1 +#define MSR_P6_PERFCTR1 0x000000c2 +#define MSR_P6_EVNTSEL0 0x00000186 +#define MSR_P6_EVNTSEL1 0x00000187 + +#define MSR_KNC_PERFCTR0 0x00000020 +#define MSR_KNC_PERFCTR1 0x00000021 +#define MSR_KNC_EVNTSEL0 0x00000028 +#define MSR_KNC_EVNTSEL1 0x00000029 + +/* Alternative perfctr range with full access. */ +#define MSR_IA32_PMC0 0x000004c1 + +/* AMD64 MSRs. Not complete. See the architecture manual for a more + complete list. */ + +#define MSR_AMD64_PATCH_LEVEL 0x0000008b +#define MSR_AMD64_TSC_RATIO 0xc0000104 +#define MSR_AMD64_NB_CFG 0xc001001f +#define MSR_AMD64_PATCH_LOADER 0xc0010020 +#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 +#define MSR_AMD64_OSVW_STATUS 0xc0010141 +#define MSR_AMD64_LS_CFG 0xc0011020 +#define MSR_AMD64_DC_CFG 0xc0011022 +#define MSR_AMD64_BU_CFG2 0xc001102a +#define MSR_AMD64_IBSFETCHCTL 0xc0011030 +#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 +#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 +#define MSR_AMD64_IBSFETCH_REG_COUNT 3 +#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) +#define MSR_AMD64_IBSOPCTL 0xc0011033 +#define MSR_AMD64_IBSOPRIP 0xc0011034 +#define MSR_AMD64_IBSOPDATA 0xc0011035 +#define MSR_AMD64_IBSOPDATA2 0xc0011036 +#define MSR_AMD64_IBSOPDATA3 0xc0011037 +#define MSR_AMD64_IBSDCLINAD 0xc0011038 +#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 +#define MSR_AMD64_IBSOP_REG_COUNT 7 +#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) +#define MSR_AMD64_IBSCTL 0xc001103a +#define MSR_AMD64_IBSBRTARGET 0xc001103b +#define MSR_AMD64_IBSOPDATA4 0xc001103d +#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ + +/* Fam 17h MSRs */ +#define MSR_F17H_IRPERF 0xc00000e9 + +/* Fam 16h MSRs */ +#define MSR_F16H_L2I_PERF_CTL 0xc0010230 +#define MSR_F16H_L2I_PERF_CTR 0xc0010231 +#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 +#define MSR_F16H_DR2_ADDR_MASK 0xc001101a +#define MSR_F16H_DR3_ADDR_MASK 0xc001101b +#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 + +/* Fam 15h MSRs */ +#define MSR_F15H_PERF_CTL 0xc0010200 +#define MSR_F15H_PERF_CTR 0xc0010201 +#define MSR_F15H_NB_PERF_CTL 0xc0010240 +#define MSR_F15H_NB_PERF_CTR 0xc0010241 +#define MSR_F15H_PTSC 0xc0010280 +#define MSR_F15H_IC_CFG 0xc0011021 + +/* Fam 10h MSRs */ +#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 +#define FAM10H_MMIO_CONF_ENABLE (1<<0) +#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf +#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 +#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL +#define FAM10H_MMIO_CONF_BASE_SHIFT 20 +#define MSR_FAM10H_NODE_ID 0xc001100c + +/* K8 MSRs */ +#define MSR_K8_TOP_MEM1 0xc001001a +#define MSR_K8_TOP_MEM2 0xc001001d +#define MSR_K8_SYSCFG 0xc0010010 +#define MSR_K8_INT_PENDING_MSG 0xc0010055 +/* C1E active bits in int pending message */ +#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 +#define MSR_K8_TSEG_ADDR 0xc0010112 +#define MSR_K8_TSEG_MASK 0xc0010113 +#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ +#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ +#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ + +/* K7 MSRs */ +#define MSR_K7_EVNTSEL0 0xc0010000 +#define MSR_K7_PERFCTR0 0xc0010004 +#define MSR_K7_EVNTSEL1 0xc0010001 +#define MSR_K7_PERFCTR1 0xc0010005 +#define MSR_K7_EVNTSEL2 0xc0010002 +#define MSR_K7_PERFCTR2 0xc0010006 +#define MSR_K7_EVNTSEL3 0xc0010003 +#define MSR_K7_PERFCTR3 0xc0010007 +#define MSR_K7_CLK_CTL 0xc001001b +#define MSR_K7_HWCR 0xc0010015 +#define MSR_K7_FID_VID_CTL 0xc0010041 +#define MSR_K7_FID_VID_STATUS 0xc0010042 + +/* K6 MSRs */ +#define MSR_K6_WHCR 0xc0000082 +#define MSR_K6_UWCCR 0xc0000085 +#define MSR_K6_EPMR 0xc0000086 +#define MSR_K6_PSOR 0xc0000087 +#define MSR_K6_PFIR 0xc0000088 + +/* Centaur-Hauls/IDT defined MSRs. */ +#define MSR_IDT_FCR1 0x00000107 +#define MSR_IDT_FCR2 0x00000108 +#define MSR_IDT_FCR3 0x00000109 +#define MSR_IDT_FCR4 0x0000010a + +#define MSR_IDT_MCR0 0x00000110 +#define MSR_IDT_MCR1 0x00000111 +#define MSR_IDT_MCR2 0x00000112 +#define MSR_IDT_MCR3 0x00000113 +#define MSR_IDT_MCR4 0x00000114 +#define MSR_IDT_MCR5 0x00000115 +#define MSR_IDT_MCR6 0x00000116 +#define MSR_IDT_MCR7 0x00000117 +#define MSR_IDT_MCR_CTRL 0x00000120 + +/* VIA Cyrix defined MSRs*/ +#define MSR_VIA_FCR 0x00001107 +#define MSR_VIA_LONGHAUL 0x0000110a +#define MSR_VIA_RNG 0x0000110b +#define MSR_VIA_BCR2 0x00001147 + +/* Transmeta defined MSRs */ +#define MSR_TMTA_LONGRUN_CTRL 0x80868010 +#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 +#define MSR_TMTA_LRTI_READOUT 0x80868018 +#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a + +/* Intel defined MSRs. */ +#define MSR_IA32_P5_MC_ADDR 0x00000000 +#define MSR_IA32_P5_MC_TYPE 0x00000001 +#define MSR_IA32_TSC 0x00000010 +#define MSR_IA32_PLATFORM_ID 0x00000017 +#define MSR_IA32_EBL_CR_POWERON 0x0000002a +#define MSR_EBC_FREQUENCY_ID 0x0000002c +#define MSR_SMI_COUNT 0x00000034 +#define MSR_IA32_FEATURE_CONTROL 0x0000003a +#define MSR_IA32_TSC_ADJUST 0x0000003b +#define MSR_IA32_BNDCFGS 0x00000d90 + +#define MSR_IA32_XSS 0x00000da0 + +#define FEATURE_CONTROL_LOCKED (1<<0) +#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) +#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) +#define FEATURE_CONTROL_LMCE (1<<20) + +#define MSR_IA32_APICBASE 0x0000001b +#define MSR_IA32_APICBASE_BSP (1<<8) +#define MSR_IA32_APICBASE_ENABLE (1<<11) +#define MSR_IA32_APICBASE_BASE (0xfffff<<12) + +#define MSR_IA32_TSCDEADLINE 0x000006e0 + +#define MSR_IA32_UCODE_WRITE 0x00000079 +#define MSR_IA32_UCODE_REV 0x0000008b + +#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b +#define MSR_IA32_SMBASE 0x0000009e + +#define MSR_IA32_PERF_STATUS 0x00000198 +#define MSR_IA32_PERF_CTL 0x00000199 +#define INTEL_PERF_CTL_MASK 0xffff +#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 +#define MSR_AMD_PERF_STATUS 0xc0010063 +#define MSR_AMD_PERF_CTL 0xc0010062 + +#define MSR_IA32_MPERF 0x000000e7 +#define MSR_IA32_APERF 0x000000e8 + +#define MSR_IA32_THERM_CONTROL 0x0000019a +#define MSR_IA32_THERM_INTERRUPT 0x0000019b + +#define THERM_INT_HIGH_ENABLE (1 << 0) +#define THERM_INT_LOW_ENABLE (1 << 1) +#define THERM_INT_PLN_ENABLE (1 << 24) + +#define MSR_IA32_THERM_STATUS 0x0000019c + +#define THERM_STATUS_PROCHOT (1 << 0) +#define THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_THERM2_CTL 0x0000019d + +#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) + +#define MSR_IA32_MISC_ENABLE 0x000001a0 + +#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 + +#define MSR_MISC_PWR_MGMT 0x000001aa + +#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 +#define ENERGY_PERF_BIAS_PERFORMANCE 0 +#define ENERGY_PERF_BIAS_NORMAL 6 +#define ENERGY_PERF_BIAS_POWERSAVE 15 + +#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 + +#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) +#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 + +#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) +#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) +#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) + +/* Thermal Thresholds Support */ +#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) +#define THERM_SHIFT_THRESHOLD0 8 +#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) +#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) +#define THERM_SHIFT_THRESHOLD1 16 +#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) +#define THERM_STATUS_THRESHOLD0 (1 << 6) +#define THERM_LOG_THRESHOLD0 (1 << 7) +#define THERM_STATUS_THRESHOLD1 (1 << 8) +#define THERM_LOG_THRESHOLD1 (1 << 9) + +/* MISC_ENABLE bits: architectural */ +#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 +#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) +#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 +#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) +#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 +#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) +#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 +#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 +#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) + +/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ +#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 +#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) +#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 +#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) +#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 +#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) + +#define MSR_IA32_TSC_DEADLINE 0x000006E0 + +/* P4/Xeon+ specific */ +#define MSR_IA32_MCG_EAX 0x00000180 +#define MSR_IA32_MCG_EBX 0x00000181 +#define MSR_IA32_MCG_ECX 0x00000182 +#define MSR_IA32_MCG_EDX 0x00000183 +#define MSR_IA32_MCG_ESI 0x00000184 +#define MSR_IA32_MCG_EDI 0x00000185 +#define MSR_IA32_MCG_EBP 0x00000186 +#define MSR_IA32_MCG_ESP 0x00000187 +#define MSR_IA32_MCG_EFLAGS 0x00000188 +#define MSR_IA32_MCG_EIP 0x00000189 +#define MSR_IA32_MCG_RESERVED 0x0000018a + +/* Pentium IV performance counter MSRs */ +#define MSR_P4_BPU_PERFCTR0 0x00000300 +#define MSR_P4_BPU_PERFCTR1 0x00000301 +#define MSR_P4_BPU_PERFCTR2 0x00000302 +#define MSR_P4_BPU_PERFCTR3 0x00000303 +#define MSR_P4_MS_PERFCTR0 0x00000304 +#define MSR_P4_MS_PERFCTR1 0x00000305 +#define MSR_P4_MS_PERFCTR2 0x00000306 +#define MSR_P4_MS_PERFCTR3 0x00000307 +#define MSR_P4_FLAME_PERFCTR0 0x00000308 +#define MSR_P4_FLAME_PERFCTR1 0x00000309 +#define MSR_P4_FLAME_PERFCTR2 0x0000030a +#define MSR_P4_FLAME_PERFCTR3 0x0000030b +#define MSR_P4_IQ_PERFCTR0 0x0000030c +#define MSR_P4_IQ_PERFCTR1 0x0000030d +#define MSR_P4_IQ_PERFCTR2 0x0000030e +#define MSR_P4_IQ_PERFCTR3 0x0000030f +#define MSR_P4_IQ_PERFCTR4 0x00000310 +#define MSR_P4_IQ_PERFCTR5 0x00000311 +#define MSR_P4_BPU_CCCR0 0x00000360 +#define MSR_P4_BPU_CCCR1 0x00000361 +#define MSR_P4_BPU_CCCR2 0x00000362 +#define MSR_P4_BPU_CCCR3 0x00000363 +#define MSR_P4_MS_CCCR0 0x00000364 +#define MSR_P4_MS_CCCR1 0x00000365 +#define MSR_P4_MS_CCCR2 0x00000366 +#define MSR_P4_MS_CCCR3 0x00000367 +#define MSR_P4_FLAME_CCCR0 0x00000368 +#define MSR_P4_FLAME_CCCR1 0x00000369 +#define MSR_P4_FLAME_CCCR2 0x0000036a +#define MSR_P4_FLAME_CCCR3 0x0000036b +#define MSR_P4_IQ_CCCR0 0x0000036c +#define MSR_P4_IQ_CCCR1 0x0000036d +#define MSR_P4_IQ_CCCR2 0x0000036e +#define MSR_P4_IQ_CCCR3 0x0000036f +#define MSR_P4_IQ_CCCR4 0x00000370 +#define MSR_P4_IQ_CCCR5 0x00000371 +#define MSR_P4_ALF_ESCR0 0x000003ca +#define MSR_P4_ALF_ESCR1 0x000003cb +#define MSR_P4_BPU_ESCR0 0x000003b2 +#define MSR_P4_BPU_ESCR1 0x000003b3 +#define MSR_P4_BSU_ESCR0 0x000003a0 +#define MSR_P4_BSU_ESCR1 0x000003a1 +#define MSR_P4_CRU_ESCR0 0x000003b8 +#define MSR_P4_CRU_ESCR1 0x000003b9 +#define MSR_P4_CRU_ESCR2 0x000003cc +#define MSR_P4_CRU_ESCR3 0x000003cd +#define MSR_P4_CRU_ESCR4 0x000003e0 +#define MSR_P4_CRU_ESCR5 0x000003e1 +#define MSR_P4_DAC_ESCR0 0x000003a8 +#define MSR_P4_DAC_ESCR1 0x000003a9 +#define MSR_P4_FIRM_ESCR0 0x000003a4 +#define MSR_P4_FIRM_ESCR1 0x000003a5 +#define MSR_P4_FLAME_ESCR0 0x000003a6 +#define MSR_P4_FLAME_ESCR1 0x000003a7 +#define MSR_P4_FSB_ESCR0 0x000003a2 +#define MSR_P4_FSB_ESCR1 0x000003a3 +#define MSR_P4_IQ_ESCR0 0x000003ba +#define MSR_P4_IQ_ESCR1 0x000003bb +#define MSR_P4_IS_ESCR0 0x000003b4 +#define MSR_P4_IS_ESCR1 0x000003b5 +#define MSR_P4_ITLB_ESCR0 0x000003b6 +#define MSR_P4_ITLB_ESCR1 0x000003b7 +#define MSR_P4_IX_ESCR0 0x000003c8 +#define MSR_P4_IX_ESCR1 0x000003c9 +#define MSR_P4_MOB_ESCR0 0x000003aa +#define MSR_P4_MOB_ESCR1 0x000003ab +#define MSR_P4_MS_ESCR0 0x000003c0 +#define MSR_P4_MS_ESCR1 0x000003c1 +#define MSR_P4_PMH_ESCR0 0x000003ac +#define MSR_P4_PMH_ESCR1 0x000003ad +#define MSR_P4_RAT_ESCR0 0x000003bc +#define MSR_P4_RAT_ESCR1 0x000003bd +#define MSR_P4_SAAT_ESCR0 0x000003ae +#define MSR_P4_SAAT_ESCR1 0x000003af +#define MSR_P4_SSU_ESCR0 0x000003be +#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ + +#define MSR_P4_TBPU_ESCR0 0x000003c2 +#define MSR_P4_TBPU_ESCR1 0x000003c3 +#define MSR_P4_TC_ESCR0 0x000003c4 +#define MSR_P4_TC_ESCR1 0x000003c5 +#define MSR_P4_U2L_ESCR0 0x000003b0 +#define MSR_P4_U2L_ESCR1 0x000003b1 + +#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 + +/* Intel Core-based CPU performance counters */ +#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 +#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a +#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b +#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d +#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e +#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f +#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 + +/* Geode defined MSRs */ +#define MSR_GEODE_BUSCONT_CONF0 0x00001900 + +/* Intel VT MSRs */ +#define MSR_IA32_VMX_BASIC 0x00000480 +#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 +#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 +#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 +#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 +#define MSR_IA32_VMX_MISC 0x00000485 +#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 +#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 +#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 +#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 +#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a +#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b +#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c +#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d +#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e +#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f +#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 +#define MSR_IA32_VMX_VMFUNC 0x00000491 + +/* VMX_BASIC bits and bitmasks */ +#define VMX_BASIC_VMCS_SIZE_SHIFT 32 +#define VMX_BASIC_TRUE_CTLS (1ULL << 55) +#define VMX_BASIC_64 0x0001000000000000LLU +#define VMX_BASIC_MEM_TYPE_SHIFT 50 +#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU +#define VMX_BASIC_MEM_TYPE_WB 6LLU +#define VMX_BASIC_INOUT 0x0040000000000000LLU + +/* MSR_IA32_VMX_MISC bits */ +#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) +#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F +/* AMD-V MSRs */ + +#define MSR_VM_CR 0xc0010114 +#define MSR_VM_IGNNE 0xc0010115 +#define MSR_VM_HSAVE_PA 0xc0010117 + +#endif /* _UAPI_ASM_X86_MSR_INDEX_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: linux-snps-arc This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> --- arch/x86/include/asm/msr-index.h | 694 +-------------------------------- arch/x86/include/uapi/asm/msr-index.h | 698 ++++++++++++++++++++++++++++++++++ 2 files changed, 699 insertions(+), 693 deletions(-) create mode 100644 arch/x86/include/uapi/asm/msr-index.h diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 710273c617b8..1baa0628da74 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -1,698 +1,6 @@ #ifndef _ASM_X86_MSR_INDEX_H #define _ASM_X86_MSR_INDEX_H -/* - * CPU model specific register (MSR) numbers. - * - * Do not add new entries to this file unless the definitions are shared - * between multiple compilation units. - */ - -/* x86-64 specific MSRs */ -#define MSR_EFER 0xc0000080 /* extended feature register */ -#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ -#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ -#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ -#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ -#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ -#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ -#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ -#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ - -/* EFER bits: */ -#define _EFER_SCE 0 /* SYSCALL/SYSRET */ -#define _EFER_LME 8 /* Long mode enable */ -#define _EFER_LMA 10 /* Long mode active (read-only) */ -#define _EFER_NX 11 /* No execute enable */ -#define _EFER_SVME 12 /* Enable virtualization */ -#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ -#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ - -#define EFER_SCE (1<<_EFER_SCE) -#define EFER_LME (1<<_EFER_LME) -#define EFER_LMA (1<<_EFER_LMA) -#define EFER_NX (1<<_EFER_NX) -#define EFER_SVME (1<<_EFER_SVME) -#define EFER_LMSLE (1<<_EFER_LMSLE) -#define EFER_FFXSR (1<<_EFER_FFXSR) - -/* Intel MSRs. Some also available on other CPUs */ - -#define MSR_PPIN_CTL 0x0000004e -#define MSR_PPIN 0x0000004f - -#define MSR_IA32_PERFCTR0 0x000000c1 -#define MSR_IA32_PERFCTR1 0x000000c2 -#define MSR_FSB_FREQ 0x000000cd -#define MSR_PLATFORM_INFO 0x000000ce - -#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 -#define NHM_C3_AUTO_DEMOTE (1UL << 25) -#define NHM_C1_AUTO_DEMOTE (1UL << 26) -#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) -#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) -#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) - -#define MSR_MTRRcap 0x000000fe -#define MSR_IA32_BBL_CR_CTL 0x00000119 -#define MSR_IA32_BBL_CR_CTL3 0x0000011e - -#define MSR_IA32_SYSENTER_CS 0x00000174 -#define MSR_IA32_SYSENTER_ESP 0x00000175 -#define MSR_IA32_SYSENTER_EIP 0x00000176 - -#define MSR_IA32_MCG_CAP 0x00000179 -#define MSR_IA32_MCG_STATUS 0x0000017a -#define MSR_IA32_MCG_CTL 0x0000017b -#define MSR_IA32_MCG_EXT_CTL 0x000004d0 - -#define MSR_OFFCORE_RSP_0 0x000001a6 -#define MSR_OFFCORE_RSP_1 0x000001a7 -#define MSR_TURBO_RATIO_LIMIT 0x000001ad -#define MSR_TURBO_RATIO_LIMIT1 0x000001ae -#define MSR_TURBO_RATIO_LIMIT2 0x000001af - -#define MSR_LBR_SELECT 0x000001c8 -#define MSR_LBR_TOS 0x000001c9 -#define MSR_LBR_NHM_FROM 0x00000680 -#define MSR_LBR_NHM_TO 0x000006c0 -#define MSR_LBR_CORE_FROM 0x00000040 -#define MSR_LBR_CORE_TO 0x00000060 - -#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ -#define LBR_INFO_MISPRED BIT_ULL(63) -#define LBR_INFO_IN_TX BIT_ULL(62) -#define LBR_INFO_ABORT BIT_ULL(61) -#define LBR_INFO_CYCLES 0xffff - -#define MSR_IA32_PEBS_ENABLE 0x000003f1 -#define MSR_IA32_DS_AREA 0x00000600 -#define MSR_IA32_PERF_CAPABILITIES 0x00000345 -#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 - -#define MSR_IA32_RTIT_CTL 0x00000570 -#define MSR_IA32_RTIT_STATUS 0x00000571 -#define MSR_IA32_RTIT_ADDR0_A 0x00000580 -#define MSR_IA32_RTIT_ADDR0_B 0x00000581 -#define MSR_IA32_RTIT_ADDR1_A 0x00000582 -#define MSR_IA32_RTIT_ADDR1_B 0x00000583 -#define MSR_IA32_RTIT_ADDR2_A 0x00000584 -#define MSR_IA32_RTIT_ADDR2_B 0x00000585 -#define MSR_IA32_RTIT_ADDR3_A 0x00000586 -#define MSR_IA32_RTIT_ADDR3_B 0x00000587 -#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 -#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 -#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 - -#define MSR_MTRRfix64K_00000 0x00000250 -#define MSR_MTRRfix16K_80000 0x00000258 -#define MSR_MTRRfix16K_A0000 0x00000259 -#define MSR_MTRRfix4K_C0000 0x00000268 -#define MSR_MTRRfix4K_C8000 0x00000269 -#define MSR_MTRRfix4K_D0000 0x0000026a -#define MSR_MTRRfix4K_D8000 0x0000026b -#define MSR_MTRRfix4K_E0000 0x0000026c -#define MSR_MTRRfix4K_E8000 0x0000026d -#define MSR_MTRRfix4K_F0000 0x0000026e -#define MSR_MTRRfix4K_F8000 0x0000026f -#define MSR_MTRRdefType 0x000002ff - -#define MSR_IA32_CR_PAT 0x00000277 - -#define MSR_IA32_DEBUGCTLMSR 0x000001d9 -#define MSR_IA32_LASTBRANCHFROMIP 0x000001db -#define MSR_IA32_LASTBRANCHTOIP 0x000001dc -#define MSR_IA32_LASTINTFROMIP 0x000001dd -#define MSR_IA32_LASTINTTOIP 0x000001de - -/* DEBUGCTLMSR bits (others vary by model): */ -#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ -#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ -#define DEBUGCTLMSR_TR (1UL << 6) -#define DEBUGCTLMSR_BTS (1UL << 7) -#define DEBUGCTLMSR_BTINT (1UL << 8) -#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) -#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) -#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) - -#define MSR_PEBS_FRONTEND 0x000003f7 - -#define MSR_IA32_POWER_CTL 0x000001fc - -#define MSR_IA32_MC0_CTL 0x00000400 -#define MSR_IA32_MC0_STATUS 0x00000401 -#define MSR_IA32_MC0_ADDR 0x00000402 -#define MSR_IA32_MC0_MISC 0x00000403 - -/* C-state Residency Counters */ -#define MSR_PKG_C3_RESIDENCY 0x000003f8 -#define MSR_PKG_C6_RESIDENCY 0x000003f9 -#define MSR_PKG_C7_RESIDENCY 0x000003fa -#define MSR_CORE_C3_RESIDENCY 0x000003fc -#define MSR_CORE_C6_RESIDENCY 0x000003fd -#define MSR_CORE_C7_RESIDENCY 0x000003fe -#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff -#define MSR_PKG_C2_RESIDENCY 0x0000060d -#define MSR_PKG_C8_RESIDENCY 0x00000630 -#define MSR_PKG_C9_RESIDENCY 0x00000631 -#define MSR_PKG_C10_RESIDENCY 0x00000632 - -/* Interrupt Response Limit */ -#define MSR_PKGC3_IRTL 0x0000060a -#define MSR_PKGC6_IRTL 0x0000060b -#define MSR_PKGC7_IRTL 0x0000060c -#define MSR_PKGC8_IRTL 0x00000633 -#define MSR_PKGC9_IRTL 0x00000634 -#define MSR_PKGC10_IRTL 0x00000635 - -/* Run Time Average Power Limiting (RAPL) Interface */ - -#define MSR_RAPL_POWER_UNIT 0x00000606 - -#define MSR_PKG_POWER_LIMIT 0x00000610 -#define MSR_PKG_ENERGY_STATUS 0x00000611 -#define MSR_PKG_PERF_STATUS 0x00000613 -#define MSR_PKG_POWER_INFO 0x00000614 - -#define MSR_DRAM_POWER_LIMIT 0x00000618 -#define MSR_DRAM_ENERGY_STATUS 0x00000619 -#define MSR_DRAM_PERF_STATUS 0x0000061b -#define MSR_DRAM_POWER_INFO 0x0000061c - -#define MSR_PP0_POWER_LIMIT 0x00000638 -#define MSR_PP0_ENERGY_STATUS 0x00000639 -#define MSR_PP0_POLICY 0x0000063a -#define MSR_PP0_PERF_STATUS 0x0000063b - -#define MSR_PP1_POWER_LIMIT 0x00000640 -#define MSR_PP1_ENERGY_STATUS 0x00000641 -#define MSR_PP1_POLICY 0x00000642 - -/* Config TDP MSRs */ -#define MSR_CONFIG_TDP_NOMINAL 0x00000648 -#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 -#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A -#define MSR_CONFIG_TDP_CONTROL 0x0000064B -#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C - -#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D - -#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 -#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 -#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A -#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B - -#define MSR_CORE_C1_RES 0x00000660 - -#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 -#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 - -#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 -#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 -#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 - -/* Hardware P state interface */ -#define MSR_PPERF 0x0000064e -#define MSR_PERF_LIMIT_REASONS 0x0000064f -#define MSR_PM_ENABLE 0x00000770 -#define MSR_HWP_CAPABILITIES 0x00000771 -#define MSR_HWP_REQUEST_PKG 0x00000772 -#define MSR_HWP_INTERRUPT 0x00000773 -#define MSR_HWP_REQUEST 0x00000774 -#define MSR_HWP_STATUS 0x00000777 - -/* CPUID.6.EAX */ -#define HWP_BASE_BIT (1<<7) -#define HWP_NOTIFICATIONS_BIT (1<<8) -#define HWP_ACTIVITY_WINDOW_BIT (1<<9) -#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) -#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) - -/* IA32_HWP_CAPABILITIES */ -#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) -#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) -#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) -#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) - -/* IA32_HWP_REQUEST */ -#define HWP_MIN_PERF(x) (x & 0xff) -#define HWP_MAX_PERF(x) ((x & 0xff) << 8) -#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) -#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) -#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) -#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) - -/* IA32_HWP_STATUS */ -#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) - -/* IA32_HWP_INTERRUPT */ -#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) - -#define MSR_AMD64_MC0_MASK 0xc0010044 - -#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) -#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) -#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) -#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) - -#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) - -/* These are consecutive and not in the normal 4er MCE bank block */ -#define MSR_IA32_MC0_CTL2 0x00000280 -#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) - -#define MSR_P6_PERFCTR0 0x000000c1 -#define MSR_P6_PERFCTR1 0x000000c2 -#define MSR_P6_EVNTSEL0 0x00000186 -#define MSR_P6_EVNTSEL1 0x00000187 - -#define MSR_KNC_PERFCTR0 0x00000020 -#define MSR_KNC_PERFCTR1 0x00000021 -#define MSR_KNC_EVNTSEL0 0x00000028 -#define MSR_KNC_EVNTSEL1 0x00000029 - -/* Alternative perfctr range with full access. */ -#define MSR_IA32_PMC0 0x000004c1 - -/* AMD64 MSRs. Not complete. See the architecture manual for a more - complete list. */ - -#define MSR_AMD64_PATCH_LEVEL 0x0000008b -#define MSR_AMD64_TSC_RATIO 0xc0000104 -#define MSR_AMD64_NB_CFG 0xc001001f -#define MSR_AMD64_PATCH_LOADER 0xc0010020 -#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 -#define MSR_AMD64_OSVW_STATUS 0xc0010141 -#define MSR_AMD64_LS_CFG 0xc0011020 -#define MSR_AMD64_DC_CFG 0xc0011022 -#define MSR_AMD64_BU_CFG2 0xc001102a -#define MSR_AMD64_IBSFETCHCTL 0xc0011030 -#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 -#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 -#define MSR_AMD64_IBSFETCH_REG_COUNT 3 -#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) -#define MSR_AMD64_IBSOPCTL 0xc0011033 -#define MSR_AMD64_IBSOPRIP 0xc0011034 -#define MSR_AMD64_IBSOPDATA 0xc0011035 -#define MSR_AMD64_IBSOPDATA2 0xc0011036 -#define MSR_AMD64_IBSOPDATA3 0xc0011037 -#define MSR_AMD64_IBSDCLINAD 0xc0011038 -#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 -#define MSR_AMD64_IBSOP_REG_COUNT 7 -#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) -#define MSR_AMD64_IBSCTL 0xc001103a -#define MSR_AMD64_IBSBRTARGET 0xc001103b -#define MSR_AMD64_IBSOPDATA4 0xc001103d -#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ - -/* Fam 17h MSRs */ -#define MSR_F17H_IRPERF 0xc00000e9 - -/* Fam 16h MSRs */ -#define MSR_F16H_L2I_PERF_CTL 0xc0010230 -#define MSR_F16H_L2I_PERF_CTR 0xc0010231 -#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 -#define MSR_F16H_DR2_ADDR_MASK 0xc001101a -#define MSR_F16H_DR3_ADDR_MASK 0xc001101b -#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 - -/* Fam 15h MSRs */ -#define MSR_F15H_PERF_CTL 0xc0010200 -#define MSR_F15H_PERF_CTR 0xc0010201 -#define MSR_F15H_NB_PERF_CTL 0xc0010240 -#define MSR_F15H_NB_PERF_CTR 0xc0010241 -#define MSR_F15H_PTSC 0xc0010280 -#define MSR_F15H_IC_CFG 0xc0011021 - -/* Fam 10h MSRs */ -#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 -#define FAM10H_MMIO_CONF_ENABLE (1<<0) -#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf -#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 -#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL -#define FAM10H_MMIO_CONF_BASE_SHIFT 20 -#define MSR_FAM10H_NODE_ID 0xc001100c - -/* K8 MSRs */ -#define MSR_K8_TOP_MEM1 0xc001001a -#define MSR_K8_TOP_MEM2 0xc001001d -#define MSR_K8_SYSCFG 0xc0010010 -#define MSR_K8_INT_PENDING_MSG 0xc0010055 -/* C1E active bits in int pending message */ -#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 -#define MSR_K8_TSEG_ADDR 0xc0010112 -#define MSR_K8_TSEG_MASK 0xc0010113 -#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ -#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ -#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ - -/* K7 MSRs */ -#define MSR_K7_EVNTSEL0 0xc0010000 -#define MSR_K7_PERFCTR0 0xc0010004 -#define MSR_K7_EVNTSEL1 0xc0010001 -#define MSR_K7_PERFCTR1 0xc0010005 -#define MSR_K7_EVNTSEL2 0xc0010002 -#define MSR_K7_PERFCTR2 0xc0010006 -#define MSR_K7_EVNTSEL3 0xc0010003 -#define MSR_K7_PERFCTR3 0xc0010007 -#define MSR_K7_CLK_CTL 0xc001001b -#define MSR_K7_HWCR 0xc0010015 -#define MSR_K7_FID_VID_CTL 0xc0010041 -#define MSR_K7_FID_VID_STATUS 0xc0010042 - -/* K6 MSRs */ -#define MSR_K6_WHCR 0xc0000082 -#define MSR_K6_UWCCR 0xc0000085 -#define MSR_K6_EPMR 0xc0000086 -#define MSR_K6_PSOR 0xc0000087 -#define MSR_K6_PFIR 0xc0000088 - -/* Centaur-Hauls/IDT defined MSRs. */ -#define MSR_IDT_FCR1 0x00000107 -#define MSR_IDT_FCR2 0x00000108 -#define MSR_IDT_FCR3 0x00000109 -#define MSR_IDT_FCR4 0x0000010a - -#define MSR_IDT_MCR0 0x00000110 -#define MSR_IDT_MCR1 0x00000111 -#define MSR_IDT_MCR2 0x00000112 -#define MSR_IDT_MCR3 0x00000113 -#define MSR_IDT_MCR4 0x00000114 -#define MSR_IDT_MCR5 0x00000115 -#define MSR_IDT_MCR6 0x00000116 -#define MSR_IDT_MCR7 0x00000117 -#define MSR_IDT_MCR_CTRL 0x00000120 - -/* VIA Cyrix defined MSRs*/ -#define MSR_VIA_FCR 0x00001107 -#define MSR_VIA_LONGHAUL 0x0000110a -#define MSR_VIA_RNG 0x0000110b -#define MSR_VIA_BCR2 0x00001147 - -/* Transmeta defined MSRs */ -#define MSR_TMTA_LONGRUN_CTRL 0x80868010 -#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 -#define MSR_TMTA_LRTI_READOUT 0x80868018 -#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a - -/* Intel defined MSRs. */ -#define MSR_IA32_P5_MC_ADDR 0x00000000 -#define MSR_IA32_P5_MC_TYPE 0x00000001 -#define MSR_IA32_TSC 0x00000010 -#define MSR_IA32_PLATFORM_ID 0x00000017 -#define MSR_IA32_EBL_CR_POWERON 0x0000002a -#define MSR_EBC_FREQUENCY_ID 0x0000002c -#define MSR_SMI_COUNT 0x00000034 -#define MSR_IA32_FEATURE_CONTROL 0x0000003a -#define MSR_IA32_TSC_ADJUST 0x0000003b -#define MSR_IA32_BNDCFGS 0x00000d90 - -#define MSR_IA32_XSS 0x00000da0 - -#define FEATURE_CONTROL_LOCKED (1<<0) -#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) -#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) -#define FEATURE_CONTROL_LMCE (1<<20) - -#define MSR_IA32_APICBASE 0x0000001b -#define MSR_IA32_APICBASE_BSP (1<<8) -#define MSR_IA32_APICBASE_ENABLE (1<<11) -#define MSR_IA32_APICBASE_BASE (0xfffff<<12) - -#define MSR_IA32_TSCDEADLINE 0x000006e0 - -#define MSR_IA32_UCODE_WRITE 0x00000079 -#define MSR_IA32_UCODE_REV 0x0000008b - -#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b -#define MSR_IA32_SMBASE 0x0000009e - -#define MSR_IA32_PERF_STATUS 0x00000198 -#define MSR_IA32_PERF_CTL 0x00000199 -#define INTEL_PERF_CTL_MASK 0xffff -#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 -#define MSR_AMD_PERF_STATUS 0xc0010063 -#define MSR_AMD_PERF_CTL 0xc0010062 - -#define MSR_IA32_MPERF 0x000000e7 -#define MSR_IA32_APERF 0x000000e8 - -#define MSR_IA32_THERM_CONTROL 0x0000019a -#define MSR_IA32_THERM_INTERRUPT 0x0000019b - -#define THERM_INT_HIGH_ENABLE (1 << 0) -#define THERM_INT_LOW_ENABLE (1 << 1) -#define THERM_INT_PLN_ENABLE (1 << 24) - -#define MSR_IA32_THERM_STATUS 0x0000019c - -#define THERM_STATUS_PROCHOT (1 << 0) -#define THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_THERM2_CTL 0x0000019d - -#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) - -#define MSR_IA32_MISC_ENABLE 0x000001a0 - -#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 - -#define MSR_MISC_PWR_MGMT 0x000001aa - -#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 -#define ENERGY_PERF_BIAS_PERFORMANCE 0 -#define ENERGY_PERF_BIAS_NORMAL 6 -#define ENERGY_PERF_BIAS_POWERSAVE 15 - -#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 - -#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) -#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 - -#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) -#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) -#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) - -/* Thermal Thresholds Support */ -#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) -#define THERM_SHIFT_THRESHOLD0 8 -#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) -#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) -#define THERM_SHIFT_THRESHOLD1 16 -#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) -#define THERM_STATUS_THRESHOLD0 (1 << 6) -#define THERM_LOG_THRESHOLD0 (1 << 7) -#define THERM_STATUS_THRESHOLD1 (1 << 8) -#define THERM_LOG_THRESHOLD1 (1 << 9) - -/* MISC_ENABLE bits: architectural */ -#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 -#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) -#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 -#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) -#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 -#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) -#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 -#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 -#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) - -/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ -#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 -#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) -#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 -#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) -#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 -#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) - -#define MSR_IA32_TSC_DEADLINE 0x000006E0 - -/* P4/Xeon+ specific */ -#define MSR_IA32_MCG_EAX 0x00000180 -#define MSR_IA32_MCG_EBX 0x00000181 -#define MSR_IA32_MCG_ECX 0x00000182 -#define MSR_IA32_MCG_EDX 0x00000183 -#define MSR_IA32_MCG_ESI 0x00000184 -#define MSR_IA32_MCG_EDI 0x00000185 -#define MSR_IA32_MCG_EBP 0x00000186 -#define MSR_IA32_MCG_ESP 0x00000187 -#define MSR_IA32_MCG_EFLAGS 0x00000188 -#define MSR_IA32_MCG_EIP 0x00000189 -#define MSR_IA32_MCG_RESERVED 0x0000018a - -/* Pentium IV performance counter MSRs */ -#define MSR_P4_BPU_PERFCTR0 0x00000300 -#define MSR_P4_BPU_PERFCTR1 0x00000301 -#define MSR_P4_BPU_PERFCTR2 0x00000302 -#define MSR_P4_BPU_PERFCTR3 0x00000303 -#define MSR_P4_MS_PERFCTR0 0x00000304 -#define MSR_P4_MS_PERFCTR1 0x00000305 -#define MSR_P4_MS_PERFCTR2 0x00000306 -#define MSR_P4_MS_PERFCTR3 0x00000307 -#define MSR_P4_FLAME_PERFCTR0 0x00000308 -#define MSR_P4_FLAME_PERFCTR1 0x00000309 -#define MSR_P4_FLAME_PERFCTR2 0x0000030a -#define MSR_P4_FLAME_PERFCTR3 0x0000030b -#define MSR_P4_IQ_PERFCTR0 0x0000030c -#define MSR_P4_IQ_PERFCTR1 0x0000030d -#define MSR_P4_IQ_PERFCTR2 0x0000030e -#define MSR_P4_IQ_PERFCTR3 0x0000030f -#define MSR_P4_IQ_PERFCTR4 0x00000310 -#define MSR_P4_IQ_PERFCTR5 0x00000311 -#define MSR_P4_BPU_CCCR0 0x00000360 -#define MSR_P4_BPU_CCCR1 0x00000361 -#define MSR_P4_BPU_CCCR2 0x00000362 -#define MSR_P4_BPU_CCCR3 0x00000363 -#define MSR_P4_MS_CCCR0 0x00000364 -#define MSR_P4_MS_CCCR1 0x00000365 -#define MSR_P4_MS_CCCR2 0x00000366 -#define MSR_P4_MS_CCCR3 0x00000367 -#define MSR_P4_FLAME_CCCR0 0x00000368 -#define MSR_P4_FLAME_CCCR1 0x00000369 -#define MSR_P4_FLAME_CCCR2 0x0000036a -#define MSR_P4_FLAME_CCCR3 0x0000036b -#define MSR_P4_IQ_CCCR0 0x0000036c -#define MSR_P4_IQ_CCCR1 0x0000036d -#define MSR_P4_IQ_CCCR2 0x0000036e -#define MSR_P4_IQ_CCCR3 0x0000036f -#define MSR_P4_IQ_CCCR4 0x00000370 -#define MSR_P4_IQ_CCCR5 0x00000371 -#define MSR_P4_ALF_ESCR0 0x000003ca -#define MSR_P4_ALF_ESCR1 0x000003cb -#define MSR_P4_BPU_ESCR0 0x000003b2 -#define MSR_P4_BPU_ESCR1 0x000003b3 -#define MSR_P4_BSU_ESCR0 0x000003a0 -#define MSR_P4_BSU_ESCR1 0x000003a1 -#define MSR_P4_CRU_ESCR0 0x000003b8 -#define MSR_P4_CRU_ESCR1 0x000003b9 -#define MSR_P4_CRU_ESCR2 0x000003cc -#define MSR_P4_CRU_ESCR3 0x000003cd -#define MSR_P4_CRU_ESCR4 0x000003e0 -#define MSR_P4_CRU_ESCR5 0x000003e1 -#define MSR_P4_DAC_ESCR0 0x000003a8 -#define MSR_P4_DAC_ESCR1 0x000003a9 -#define MSR_P4_FIRM_ESCR0 0x000003a4 -#define MSR_P4_FIRM_ESCR1 0x000003a5 -#define MSR_P4_FLAME_ESCR0 0x000003a6 -#define MSR_P4_FLAME_ESCR1 0x000003a7 -#define MSR_P4_FSB_ESCR0 0x000003a2 -#define MSR_P4_FSB_ESCR1 0x000003a3 -#define MSR_P4_IQ_ESCR0 0x000003ba -#define MSR_P4_IQ_ESCR1 0x000003bb -#define MSR_P4_IS_ESCR0 0x000003b4 -#define MSR_P4_IS_ESCR1 0x000003b5 -#define MSR_P4_ITLB_ESCR0 0x000003b6 -#define MSR_P4_ITLB_ESCR1 0x000003b7 -#define MSR_P4_IX_ESCR0 0x000003c8 -#define MSR_P4_IX_ESCR1 0x000003c9 -#define MSR_P4_MOB_ESCR0 0x000003aa -#define MSR_P4_MOB_ESCR1 0x000003ab -#define MSR_P4_MS_ESCR0 0x000003c0 -#define MSR_P4_MS_ESCR1 0x000003c1 -#define MSR_P4_PMH_ESCR0 0x000003ac -#define MSR_P4_PMH_ESCR1 0x000003ad -#define MSR_P4_RAT_ESCR0 0x000003bc -#define MSR_P4_RAT_ESCR1 0x000003bd -#define MSR_P4_SAAT_ESCR0 0x000003ae -#define MSR_P4_SAAT_ESCR1 0x000003af -#define MSR_P4_SSU_ESCR0 0x000003be -#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ - -#define MSR_P4_TBPU_ESCR0 0x000003c2 -#define MSR_P4_TBPU_ESCR1 0x000003c3 -#define MSR_P4_TC_ESCR0 0x000003c4 -#define MSR_P4_TC_ESCR1 0x000003c5 -#define MSR_P4_U2L_ESCR0 0x000003b0 -#define MSR_P4_U2L_ESCR1 0x000003b1 - -#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 - -/* Intel Core-based CPU performance counters */ -#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 -#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a -#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b -#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d -#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e -#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f -#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 - -/* Geode defined MSRs */ -#define MSR_GEODE_BUSCONT_CONF0 0x00001900 - -/* Intel VT MSRs */ -#define MSR_IA32_VMX_BASIC 0x00000480 -#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 -#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 -#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 -#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 -#define MSR_IA32_VMX_MISC 0x00000485 -#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 -#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 -#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 -#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 -#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a -#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b -#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c -#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d -#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e -#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f -#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 -#define MSR_IA32_VMX_VMFUNC 0x00000491 - -/* VMX_BASIC bits and bitmasks */ -#define VMX_BASIC_VMCS_SIZE_SHIFT 32 -#define VMX_BASIC_TRUE_CTLS (1ULL << 55) -#define VMX_BASIC_64 0x0001000000000000LLU -#define VMX_BASIC_MEM_TYPE_SHIFT 50 -#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU -#define VMX_BASIC_MEM_TYPE_WB 6LLU -#define VMX_BASIC_INOUT 0x0040000000000000LLU - -/* MSR_IA32_VMX_MISC bits */ -#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) -#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F -/* AMD-V MSRs */ - -#define MSR_VM_CR 0xc0010114 -#define MSR_VM_IGNNE 0xc0010115 -#define MSR_VM_HSAVE_PA 0xc0010117 +#include <uapi/asm/msr-index.h> #endif /* _ASM_X86_MSR_INDEX_H */ diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h new file mode 100644 index 000000000000..d097e832ee3c --- /dev/null +++ b/arch/x86/include/uapi/asm/msr-index.h @@ -0,0 +1,698 @@ +#ifndef _UAPI_ASM_X86_MSR_INDEX_H +#define _UAPI_ASM_X86_MSR_INDEX_H + +/* + * CPU model specific register (MSR) numbers. + * + * Do not add new entries to this file unless the definitions are shared + * between multiple compilation units. + */ + +/* x86-64 specific MSRs */ +#define MSR_EFER 0xc0000080 /* extended feature register */ +#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ +#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ +#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ +#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ +#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ +#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ +#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ +#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ + +/* EFER bits: */ +#define _EFER_SCE 0 /* SYSCALL/SYSRET */ +#define _EFER_LME 8 /* Long mode enable */ +#define _EFER_LMA 10 /* Long mode active (read-only) */ +#define _EFER_NX 11 /* No execute enable */ +#define _EFER_SVME 12 /* Enable virtualization */ +#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ +#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ + +#define EFER_SCE (1<<_EFER_SCE) +#define EFER_LME (1<<_EFER_LME) +#define EFER_LMA (1<<_EFER_LMA) +#define EFER_NX (1<<_EFER_NX) +#define EFER_SVME (1<<_EFER_SVME) +#define EFER_LMSLE (1<<_EFER_LMSLE) +#define EFER_FFXSR (1<<_EFER_FFXSR) + +/* Intel MSRs. Some also available on other CPUs */ + +#define MSR_PPIN_CTL 0x0000004e +#define MSR_PPIN 0x0000004f + +#define MSR_IA32_PERFCTR0 0x000000c1 +#define MSR_IA32_PERFCTR1 0x000000c2 +#define MSR_FSB_FREQ 0x000000cd +#define MSR_PLATFORM_INFO 0x000000ce + +#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 +#define NHM_C3_AUTO_DEMOTE (1UL << 25) +#define NHM_C1_AUTO_DEMOTE (1UL << 26) +#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) +#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) +#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) + +#define MSR_MTRRcap 0x000000fe +#define MSR_IA32_BBL_CR_CTL 0x00000119 +#define MSR_IA32_BBL_CR_CTL3 0x0000011e + +#define MSR_IA32_SYSENTER_CS 0x00000174 +#define MSR_IA32_SYSENTER_ESP 0x00000175 +#define MSR_IA32_SYSENTER_EIP 0x00000176 + +#define MSR_IA32_MCG_CAP 0x00000179 +#define MSR_IA32_MCG_STATUS 0x0000017a +#define MSR_IA32_MCG_CTL 0x0000017b +#define MSR_IA32_MCG_EXT_CTL 0x000004d0 + +#define MSR_OFFCORE_RSP_0 0x000001a6 +#define MSR_OFFCORE_RSP_1 0x000001a7 +#define MSR_TURBO_RATIO_LIMIT 0x000001ad +#define MSR_TURBO_RATIO_LIMIT1 0x000001ae +#define MSR_TURBO_RATIO_LIMIT2 0x000001af + +#define MSR_LBR_SELECT 0x000001c8 +#define MSR_LBR_TOS 0x000001c9 +#define MSR_LBR_NHM_FROM 0x00000680 +#define MSR_LBR_NHM_TO 0x000006c0 +#define MSR_LBR_CORE_FROM 0x00000040 +#define MSR_LBR_CORE_TO 0x00000060 + +#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ +#define LBR_INFO_MISPRED BIT_ULL(63) +#define LBR_INFO_IN_TX BIT_ULL(62) +#define LBR_INFO_ABORT BIT_ULL(61) +#define LBR_INFO_CYCLES 0xffff + +#define MSR_IA32_PEBS_ENABLE 0x000003f1 +#define MSR_IA32_DS_AREA 0x00000600 +#define MSR_IA32_PERF_CAPABILITIES 0x00000345 +#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 + +#define MSR_IA32_RTIT_CTL 0x00000570 +#define MSR_IA32_RTIT_STATUS 0x00000571 +#define MSR_IA32_RTIT_ADDR0_A 0x00000580 +#define MSR_IA32_RTIT_ADDR0_B 0x00000581 +#define MSR_IA32_RTIT_ADDR1_A 0x00000582 +#define MSR_IA32_RTIT_ADDR1_B 0x00000583 +#define MSR_IA32_RTIT_ADDR2_A 0x00000584 +#define MSR_IA32_RTIT_ADDR2_B 0x00000585 +#define MSR_IA32_RTIT_ADDR3_A 0x00000586 +#define MSR_IA32_RTIT_ADDR3_B 0x00000587 +#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 +#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 +#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 + +#define MSR_MTRRfix64K_00000 0x00000250 +#define MSR_MTRRfix16K_80000 0x00000258 +#define MSR_MTRRfix16K_A0000 0x00000259 +#define MSR_MTRRfix4K_C0000 0x00000268 +#define MSR_MTRRfix4K_C8000 0x00000269 +#define MSR_MTRRfix4K_D0000 0x0000026a +#define MSR_MTRRfix4K_D8000 0x0000026b +#define MSR_MTRRfix4K_E0000 0x0000026c +#define MSR_MTRRfix4K_E8000 0x0000026d +#define MSR_MTRRfix4K_F0000 0x0000026e +#define MSR_MTRRfix4K_F8000 0x0000026f +#define MSR_MTRRdefType 0x000002ff + +#define MSR_IA32_CR_PAT 0x00000277 + +#define MSR_IA32_DEBUGCTLMSR 0x000001d9 +#define MSR_IA32_LASTBRANCHFROMIP 0x000001db +#define MSR_IA32_LASTBRANCHTOIP 0x000001dc +#define MSR_IA32_LASTINTFROMIP 0x000001dd +#define MSR_IA32_LASTINTTOIP 0x000001de + +/* DEBUGCTLMSR bits (others vary by model): */ +#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ +#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ +#define DEBUGCTLMSR_TR (1UL << 6) +#define DEBUGCTLMSR_BTS (1UL << 7) +#define DEBUGCTLMSR_BTINT (1UL << 8) +#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) +#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) +#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) + +#define MSR_PEBS_FRONTEND 0x000003f7 + +#define MSR_IA32_POWER_CTL 0x000001fc + +#define MSR_IA32_MC0_CTL 0x00000400 +#define MSR_IA32_MC0_STATUS 0x00000401 +#define MSR_IA32_MC0_ADDR 0x00000402 +#define MSR_IA32_MC0_MISC 0x00000403 + +/* C-state Residency Counters */ +#define MSR_PKG_C3_RESIDENCY 0x000003f8 +#define MSR_PKG_C6_RESIDENCY 0x000003f9 +#define MSR_PKG_C7_RESIDENCY 0x000003fa +#define MSR_CORE_C3_RESIDENCY 0x000003fc +#define MSR_CORE_C6_RESIDENCY 0x000003fd +#define MSR_CORE_C7_RESIDENCY 0x000003fe +#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff +#define MSR_PKG_C2_RESIDENCY 0x0000060d +#define MSR_PKG_C8_RESIDENCY 0x00000630 +#define MSR_PKG_C9_RESIDENCY 0x00000631 +#define MSR_PKG_C10_RESIDENCY 0x00000632 + +/* Interrupt Response Limit */ +#define MSR_PKGC3_IRTL 0x0000060a +#define MSR_PKGC6_IRTL 0x0000060b +#define MSR_PKGC7_IRTL 0x0000060c +#define MSR_PKGC8_IRTL 0x00000633 +#define MSR_PKGC9_IRTL 0x00000634 +#define MSR_PKGC10_IRTL 0x00000635 + +/* Run Time Average Power Limiting (RAPL) Interface */ + +#define MSR_RAPL_POWER_UNIT 0x00000606 + +#define MSR_PKG_POWER_LIMIT 0x00000610 +#define MSR_PKG_ENERGY_STATUS 0x00000611 +#define MSR_PKG_PERF_STATUS 0x00000613 +#define MSR_PKG_POWER_INFO 0x00000614 + +#define MSR_DRAM_POWER_LIMIT 0x00000618 +#define MSR_DRAM_ENERGY_STATUS 0x00000619 +#define MSR_DRAM_PERF_STATUS 0x0000061b +#define MSR_DRAM_POWER_INFO 0x0000061c + +#define MSR_PP0_POWER_LIMIT 0x00000638 +#define MSR_PP0_ENERGY_STATUS 0x00000639 +#define MSR_PP0_POLICY 0x0000063a +#define MSR_PP0_PERF_STATUS 0x0000063b + +#define MSR_PP1_POWER_LIMIT 0x00000640 +#define MSR_PP1_ENERGY_STATUS 0x00000641 +#define MSR_PP1_POLICY 0x00000642 + +/* Config TDP MSRs */ +#define MSR_CONFIG_TDP_NOMINAL 0x00000648 +#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 +#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A +#define MSR_CONFIG_TDP_CONTROL 0x0000064B +#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C + +#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D + +#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 +#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 +#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A +#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B + +#define MSR_CORE_C1_RES 0x00000660 + +#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 +#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 + +#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 +#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 +#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 + +/* Hardware P state interface */ +#define MSR_PPERF 0x0000064e +#define MSR_PERF_LIMIT_REASONS 0x0000064f +#define MSR_PM_ENABLE 0x00000770 +#define MSR_HWP_CAPABILITIES 0x00000771 +#define MSR_HWP_REQUEST_PKG 0x00000772 +#define MSR_HWP_INTERRUPT 0x00000773 +#define MSR_HWP_REQUEST 0x00000774 +#define MSR_HWP_STATUS 0x00000777 + +/* CPUID.6.EAX */ +#define HWP_BASE_BIT (1<<7) +#define HWP_NOTIFICATIONS_BIT (1<<8) +#define HWP_ACTIVITY_WINDOW_BIT (1<<9) +#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) +#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) + +/* IA32_HWP_CAPABILITIES */ +#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) +#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) +#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) +#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) + +/* IA32_HWP_REQUEST */ +#define HWP_MIN_PERF(x) (x & 0xff) +#define HWP_MAX_PERF(x) ((x & 0xff) << 8) +#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) +#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) +#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) +#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) + +/* IA32_HWP_STATUS */ +#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) + +/* IA32_HWP_INTERRUPT */ +#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) + +#define MSR_AMD64_MC0_MASK 0xc0010044 + +#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) +#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) +#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) +#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) + +#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) + +/* These are consecutive and not in the normal 4er MCE bank block */ +#define MSR_IA32_MC0_CTL2 0x00000280 +#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) + +#define MSR_P6_PERFCTR0 0x000000c1 +#define MSR_P6_PERFCTR1 0x000000c2 +#define MSR_P6_EVNTSEL0 0x00000186 +#define MSR_P6_EVNTSEL1 0x00000187 + +#define MSR_KNC_PERFCTR0 0x00000020 +#define MSR_KNC_PERFCTR1 0x00000021 +#define MSR_KNC_EVNTSEL0 0x00000028 +#define MSR_KNC_EVNTSEL1 0x00000029 + +/* Alternative perfctr range with full access. */ +#define MSR_IA32_PMC0 0x000004c1 + +/* AMD64 MSRs. Not complete. See the architecture manual for a more + complete list. */ + +#define MSR_AMD64_PATCH_LEVEL 0x0000008b +#define MSR_AMD64_TSC_RATIO 0xc0000104 +#define MSR_AMD64_NB_CFG 0xc001001f +#define MSR_AMD64_PATCH_LOADER 0xc0010020 +#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 +#define MSR_AMD64_OSVW_STATUS 0xc0010141 +#define MSR_AMD64_LS_CFG 0xc0011020 +#define MSR_AMD64_DC_CFG 0xc0011022 +#define MSR_AMD64_BU_CFG2 0xc001102a +#define MSR_AMD64_IBSFETCHCTL 0xc0011030 +#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 +#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 +#define MSR_AMD64_IBSFETCH_REG_COUNT 3 +#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) +#define MSR_AMD64_IBSOPCTL 0xc0011033 +#define MSR_AMD64_IBSOPRIP 0xc0011034 +#define MSR_AMD64_IBSOPDATA 0xc0011035 +#define MSR_AMD64_IBSOPDATA2 0xc0011036 +#define MSR_AMD64_IBSOPDATA3 0xc0011037 +#define MSR_AMD64_IBSDCLINAD 0xc0011038 +#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 +#define MSR_AMD64_IBSOP_REG_COUNT 7 +#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) +#define MSR_AMD64_IBSCTL 0xc001103a +#define MSR_AMD64_IBSBRTARGET 0xc001103b +#define MSR_AMD64_IBSOPDATA4 0xc001103d +#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ + +/* Fam 17h MSRs */ +#define MSR_F17H_IRPERF 0xc00000e9 + +/* Fam 16h MSRs */ +#define MSR_F16H_L2I_PERF_CTL 0xc0010230 +#define MSR_F16H_L2I_PERF_CTR 0xc0010231 +#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 +#define MSR_F16H_DR2_ADDR_MASK 0xc001101a +#define MSR_F16H_DR3_ADDR_MASK 0xc001101b +#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 + +/* Fam 15h MSRs */ +#define MSR_F15H_PERF_CTL 0xc0010200 +#define MSR_F15H_PERF_CTR 0xc0010201 +#define MSR_F15H_NB_PERF_CTL 0xc0010240 +#define MSR_F15H_NB_PERF_CTR 0xc0010241 +#define MSR_F15H_PTSC 0xc0010280 +#define MSR_F15H_IC_CFG 0xc0011021 + +/* Fam 10h MSRs */ +#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 +#define FAM10H_MMIO_CONF_ENABLE (1<<0) +#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf +#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 +#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL +#define FAM10H_MMIO_CONF_BASE_SHIFT 20 +#define MSR_FAM10H_NODE_ID 0xc001100c + +/* K8 MSRs */ +#define MSR_K8_TOP_MEM1 0xc001001a +#define MSR_K8_TOP_MEM2 0xc001001d +#define MSR_K8_SYSCFG 0xc0010010 +#define MSR_K8_INT_PENDING_MSG 0xc0010055 +/* C1E active bits in int pending message */ +#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 +#define MSR_K8_TSEG_ADDR 0xc0010112 +#define MSR_K8_TSEG_MASK 0xc0010113 +#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ +#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ +#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ + +/* K7 MSRs */ +#define MSR_K7_EVNTSEL0 0xc0010000 +#define MSR_K7_PERFCTR0 0xc0010004 +#define MSR_K7_EVNTSEL1 0xc0010001 +#define MSR_K7_PERFCTR1 0xc0010005 +#define MSR_K7_EVNTSEL2 0xc0010002 +#define MSR_K7_PERFCTR2 0xc0010006 +#define MSR_K7_EVNTSEL3 0xc0010003 +#define MSR_K7_PERFCTR3 0xc0010007 +#define MSR_K7_CLK_CTL 0xc001001b +#define MSR_K7_HWCR 0xc0010015 +#define MSR_K7_FID_VID_CTL 0xc0010041 +#define MSR_K7_FID_VID_STATUS 0xc0010042 + +/* K6 MSRs */ +#define MSR_K6_WHCR 0xc0000082 +#define MSR_K6_UWCCR 0xc0000085 +#define MSR_K6_EPMR 0xc0000086 +#define MSR_K6_PSOR 0xc0000087 +#define MSR_K6_PFIR 0xc0000088 + +/* Centaur-Hauls/IDT defined MSRs. */ +#define MSR_IDT_FCR1 0x00000107 +#define MSR_IDT_FCR2 0x00000108 +#define MSR_IDT_FCR3 0x00000109 +#define MSR_IDT_FCR4 0x0000010a + +#define MSR_IDT_MCR0 0x00000110 +#define MSR_IDT_MCR1 0x00000111 +#define MSR_IDT_MCR2 0x00000112 +#define MSR_IDT_MCR3 0x00000113 +#define MSR_IDT_MCR4 0x00000114 +#define MSR_IDT_MCR5 0x00000115 +#define MSR_IDT_MCR6 0x00000116 +#define MSR_IDT_MCR7 0x00000117 +#define MSR_IDT_MCR_CTRL 0x00000120 + +/* VIA Cyrix defined MSRs*/ +#define MSR_VIA_FCR 0x00001107 +#define MSR_VIA_LONGHAUL 0x0000110a +#define MSR_VIA_RNG 0x0000110b +#define MSR_VIA_BCR2 0x00001147 + +/* Transmeta defined MSRs */ +#define MSR_TMTA_LONGRUN_CTRL 0x80868010 +#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 +#define MSR_TMTA_LRTI_READOUT 0x80868018 +#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a + +/* Intel defined MSRs. */ +#define MSR_IA32_P5_MC_ADDR 0x00000000 +#define MSR_IA32_P5_MC_TYPE 0x00000001 +#define MSR_IA32_TSC 0x00000010 +#define MSR_IA32_PLATFORM_ID 0x00000017 +#define MSR_IA32_EBL_CR_POWERON 0x0000002a +#define MSR_EBC_FREQUENCY_ID 0x0000002c +#define MSR_SMI_COUNT 0x00000034 +#define MSR_IA32_FEATURE_CONTROL 0x0000003a +#define MSR_IA32_TSC_ADJUST 0x0000003b +#define MSR_IA32_BNDCFGS 0x00000d90 + +#define MSR_IA32_XSS 0x00000da0 + +#define FEATURE_CONTROL_LOCKED (1<<0) +#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) +#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) +#define FEATURE_CONTROL_LMCE (1<<20) + +#define MSR_IA32_APICBASE 0x0000001b +#define MSR_IA32_APICBASE_BSP (1<<8) +#define MSR_IA32_APICBASE_ENABLE (1<<11) +#define MSR_IA32_APICBASE_BASE (0xfffff<<12) + +#define MSR_IA32_TSCDEADLINE 0x000006e0 + +#define MSR_IA32_UCODE_WRITE 0x00000079 +#define MSR_IA32_UCODE_REV 0x0000008b + +#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b +#define MSR_IA32_SMBASE 0x0000009e + +#define MSR_IA32_PERF_STATUS 0x00000198 +#define MSR_IA32_PERF_CTL 0x00000199 +#define INTEL_PERF_CTL_MASK 0xffff +#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 +#define MSR_AMD_PERF_STATUS 0xc0010063 +#define MSR_AMD_PERF_CTL 0xc0010062 + +#define MSR_IA32_MPERF 0x000000e7 +#define MSR_IA32_APERF 0x000000e8 + +#define MSR_IA32_THERM_CONTROL 0x0000019a +#define MSR_IA32_THERM_INTERRUPT 0x0000019b + +#define THERM_INT_HIGH_ENABLE (1 << 0) +#define THERM_INT_LOW_ENABLE (1 << 1) +#define THERM_INT_PLN_ENABLE (1 << 24) + +#define MSR_IA32_THERM_STATUS 0x0000019c + +#define THERM_STATUS_PROCHOT (1 << 0) +#define THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_THERM2_CTL 0x0000019d + +#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) + +#define MSR_IA32_MISC_ENABLE 0x000001a0 + +#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 + +#define MSR_MISC_PWR_MGMT 0x000001aa + +#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 +#define ENERGY_PERF_BIAS_PERFORMANCE 0 +#define ENERGY_PERF_BIAS_NORMAL 6 +#define ENERGY_PERF_BIAS_POWERSAVE 15 + +#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 + +#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) +#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 + +#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) +#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) +#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) + +/* Thermal Thresholds Support */ +#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) +#define THERM_SHIFT_THRESHOLD0 8 +#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) +#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) +#define THERM_SHIFT_THRESHOLD1 16 +#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) +#define THERM_STATUS_THRESHOLD0 (1 << 6) +#define THERM_LOG_THRESHOLD0 (1 << 7) +#define THERM_STATUS_THRESHOLD1 (1 << 8) +#define THERM_LOG_THRESHOLD1 (1 << 9) + +/* MISC_ENABLE bits: architectural */ +#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 +#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) +#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 +#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) +#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 +#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) +#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 +#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 +#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) + +/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ +#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 +#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) +#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 +#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) +#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 +#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) + +#define MSR_IA32_TSC_DEADLINE 0x000006E0 + +/* P4/Xeon+ specific */ +#define MSR_IA32_MCG_EAX 0x00000180 +#define MSR_IA32_MCG_EBX 0x00000181 +#define MSR_IA32_MCG_ECX 0x00000182 +#define MSR_IA32_MCG_EDX 0x00000183 +#define MSR_IA32_MCG_ESI 0x00000184 +#define MSR_IA32_MCG_EDI 0x00000185 +#define MSR_IA32_MCG_EBP 0x00000186 +#define MSR_IA32_MCG_ESP 0x00000187 +#define MSR_IA32_MCG_EFLAGS 0x00000188 +#define MSR_IA32_MCG_EIP 0x00000189 +#define MSR_IA32_MCG_RESERVED 0x0000018a + +/* Pentium IV performance counter MSRs */ +#define MSR_P4_BPU_PERFCTR0 0x00000300 +#define MSR_P4_BPU_PERFCTR1 0x00000301 +#define MSR_P4_BPU_PERFCTR2 0x00000302 +#define MSR_P4_BPU_PERFCTR3 0x00000303 +#define MSR_P4_MS_PERFCTR0 0x00000304 +#define MSR_P4_MS_PERFCTR1 0x00000305 +#define MSR_P4_MS_PERFCTR2 0x00000306 +#define MSR_P4_MS_PERFCTR3 0x00000307 +#define MSR_P4_FLAME_PERFCTR0 0x00000308 +#define MSR_P4_FLAME_PERFCTR1 0x00000309 +#define MSR_P4_FLAME_PERFCTR2 0x0000030a +#define MSR_P4_FLAME_PERFCTR3 0x0000030b +#define MSR_P4_IQ_PERFCTR0 0x0000030c +#define MSR_P4_IQ_PERFCTR1 0x0000030d +#define MSR_P4_IQ_PERFCTR2 0x0000030e +#define MSR_P4_IQ_PERFCTR3 0x0000030f +#define MSR_P4_IQ_PERFCTR4 0x00000310 +#define MSR_P4_IQ_PERFCTR5 0x00000311 +#define MSR_P4_BPU_CCCR0 0x00000360 +#define MSR_P4_BPU_CCCR1 0x00000361 +#define MSR_P4_BPU_CCCR2 0x00000362 +#define MSR_P4_BPU_CCCR3 0x00000363 +#define MSR_P4_MS_CCCR0 0x00000364 +#define MSR_P4_MS_CCCR1 0x00000365 +#define MSR_P4_MS_CCCR2 0x00000366 +#define MSR_P4_MS_CCCR3 0x00000367 +#define MSR_P4_FLAME_CCCR0 0x00000368 +#define MSR_P4_FLAME_CCCR1 0x00000369 +#define MSR_P4_FLAME_CCCR2 0x0000036a +#define MSR_P4_FLAME_CCCR3 0x0000036b +#define MSR_P4_IQ_CCCR0 0x0000036c +#define MSR_P4_IQ_CCCR1 0x0000036d +#define MSR_P4_IQ_CCCR2 0x0000036e +#define MSR_P4_IQ_CCCR3 0x0000036f +#define MSR_P4_IQ_CCCR4 0x00000370 +#define MSR_P4_IQ_CCCR5 0x00000371 +#define MSR_P4_ALF_ESCR0 0x000003ca +#define MSR_P4_ALF_ESCR1 0x000003cb +#define MSR_P4_BPU_ESCR0 0x000003b2 +#define MSR_P4_BPU_ESCR1 0x000003b3 +#define MSR_P4_BSU_ESCR0 0x000003a0 +#define MSR_P4_BSU_ESCR1 0x000003a1 +#define MSR_P4_CRU_ESCR0 0x000003b8 +#define MSR_P4_CRU_ESCR1 0x000003b9 +#define MSR_P4_CRU_ESCR2 0x000003cc +#define MSR_P4_CRU_ESCR3 0x000003cd +#define MSR_P4_CRU_ESCR4 0x000003e0 +#define MSR_P4_CRU_ESCR5 0x000003e1 +#define MSR_P4_DAC_ESCR0 0x000003a8 +#define MSR_P4_DAC_ESCR1 0x000003a9 +#define MSR_P4_FIRM_ESCR0 0x000003a4 +#define MSR_P4_FIRM_ESCR1 0x000003a5 +#define MSR_P4_FLAME_ESCR0 0x000003a6 +#define MSR_P4_FLAME_ESCR1 0x000003a7 +#define MSR_P4_FSB_ESCR0 0x000003a2 +#define MSR_P4_FSB_ESCR1 0x000003a3 +#define MSR_P4_IQ_ESCR0 0x000003ba +#define MSR_P4_IQ_ESCR1 0x000003bb +#define MSR_P4_IS_ESCR0 0x000003b4 +#define MSR_P4_IS_ESCR1 0x000003b5 +#define MSR_P4_ITLB_ESCR0 0x000003b6 +#define MSR_P4_ITLB_ESCR1 0x000003b7 +#define MSR_P4_IX_ESCR0 0x000003c8 +#define MSR_P4_IX_ESCR1 0x000003c9 +#define MSR_P4_MOB_ESCR0 0x000003aa +#define MSR_P4_MOB_ESCR1 0x000003ab +#define MSR_P4_MS_ESCR0 0x000003c0 +#define MSR_P4_MS_ESCR1 0x000003c1 +#define MSR_P4_PMH_ESCR0 0x000003ac +#define MSR_P4_PMH_ESCR1 0x000003ad +#define MSR_P4_RAT_ESCR0 0x000003bc +#define MSR_P4_RAT_ESCR1 0x000003bd +#define MSR_P4_SAAT_ESCR0 0x000003ae +#define MSR_P4_SAAT_ESCR1 0x000003af +#define MSR_P4_SSU_ESCR0 0x000003be +#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ + +#define MSR_P4_TBPU_ESCR0 0x000003c2 +#define MSR_P4_TBPU_ESCR1 0x000003c3 +#define MSR_P4_TC_ESCR0 0x000003c4 +#define MSR_P4_TC_ESCR1 0x000003c5 +#define MSR_P4_U2L_ESCR0 0x000003b0 +#define MSR_P4_U2L_ESCR1 0x000003b1 + +#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 + +/* Intel Core-based CPU performance counters */ +#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 +#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a +#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b +#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d +#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e +#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f +#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 + +/* Geode defined MSRs */ +#define MSR_GEODE_BUSCONT_CONF0 0x00001900 + +/* Intel VT MSRs */ +#define MSR_IA32_VMX_BASIC 0x00000480 +#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 +#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 +#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 +#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 +#define MSR_IA32_VMX_MISC 0x00000485 +#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 +#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 +#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 +#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 +#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a +#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b +#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c +#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d +#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e +#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f +#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 +#define MSR_IA32_VMX_VMFUNC 0x00000491 + +/* VMX_BASIC bits and bitmasks */ +#define VMX_BASIC_VMCS_SIZE_SHIFT 32 +#define VMX_BASIC_TRUE_CTLS (1ULL << 55) +#define VMX_BASIC_64 0x0001000000000000LLU +#define VMX_BASIC_MEM_TYPE_SHIFT 50 +#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU +#define VMX_BASIC_MEM_TYPE_WB 6LLU +#define VMX_BASIC_INOUT 0x0040000000000000LLU + +/* MSR_IA32_VMX_MISC bits */ +#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) +#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F +/* AMD-V MSRs */ + +#define MSR_VM_CR 0xc0010114 +#define MSR_VM_IGNNE 0xc0010115 +#define MSR_VM_HSAVE_PA 0xc0010117 + +#endif /* _UAPI_ASM_X86_MSR_INDEX_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/x86/include/asm/msr-index.h | 694 +-------------------------------- arch/x86/include/uapi/asm/msr-index.h | 698 ++++++++++++++++++++++++++++++++++ 2 files changed, 699 insertions(+), 693 deletions(-) create mode 100644 arch/x86/include/uapi/asm/msr-index.h diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 710273c617b8..1baa0628da74 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -1,698 +1,6 @@ #ifndef _ASM_X86_MSR_INDEX_H #define _ASM_X86_MSR_INDEX_H -/* - * CPU model specific register (MSR) numbers. - * - * Do not add new entries to this file unless the definitions are shared - * between multiple compilation units. - */ - -/* x86-64 specific MSRs */ -#define MSR_EFER 0xc0000080 /* extended feature register */ -#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ -#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ -#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ -#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ -#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ -#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ -#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ -#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ - -/* EFER bits: */ -#define _EFER_SCE 0 /* SYSCALL/SYSRET */ -#define _EFER_LME 8 /* Long mode enable */ -#define _EFER_LMA 10 /* Long mode active (read-only) */ -#define _EFER_NX 11 /* No execute enable */ -#define _EFER_SVME 12 /* Enable virtualization */ -#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ -#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ - -#define EFER_SCE (1<<_EFER_SCE) -#define EFER_LME (1<<_EFER_LME) -#define EFER_LMA (1<<_EFER_LMA) -#define EFER_NX (1<<_EFER_NX) -#define EFER_SVME (1<<_EFER_SVME) -#define EFER_LMSLE (1<<_EFER_LMSLE) -#define EFER_FFXSR (1<<_EFER_FFXSR) - -/* Intel MSRs. Some also available on other CPUs */ - -#define MSR_PPIN_CTL 0x0000004e -#define MSR_PPIN 0x0000004f - -#define MSR_IA32_PERFCTR0 0x000000c1 -#define MSR_IA32_PERFCTR1 0x000000c2 -#define MSR_FSB_FREQ 0x000000cd -#define MSR_PLATFORM_INFO 0x000000ce - -#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 -#define NHM_C3_AUTO_DEMOTE (1UL << 25) -#define NHM_C1_AUTO_DEMOTE (1UL << 26) -#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) -#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) -#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) - -#define MSR_MTRRcap 0x000000fe -#define MSR_IA32_BBL_CR_CTL 0x00000119 -#define MSR_IA32_BBL_CR_CTL3 0x0000011e - -#define MSR_IA32_SYSENTER_CS 0x00000174 -#define MSR_IA32_SYSENTER_ESP 0x00000175 -#define MSR_IA32_SYSENTER_EIP 0x00000176 - -#define MSR_IA32_MCG_CAP 0x00000179 -#define MSR_IA32_MCG_STATUS 0x0000017a -#define MSR_IA32_MCG_CTL 0x0000017b -#define MSR_IA32_MCG_EXT_CTL 0x000004d0 - -#define MSR_OFFCORE_RSP_0 0x000001a6 -#define MSR_OFFCORE_RSP_1 0x000001a7 -#define MSR_TURBO_RATIO_LIMIT 0x000001ad -#define MSR_TURBO_RATIO_LIMIT1 0x000001ae -#define MSR_TURBO_RATIO_LIMIT2 0x000001af - -#define MSR_LBR_SELECT 0x000001c8 -#define MSR_LBR_TOS 0x000001c9 -#define MSR_LBR_NHM_FROM 0x00000680 -#define MSR_LBR_NHM_TO 0x000006c0 -#define MSR_LBR_CORE_FROM 0x00000040 -#define MSR_LBR_CORE_TO 0x00000060 - -#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ -#define LBR_INFO_MISPRED BIT_ULL(63) -#define LBR_INFO_IN_TX BIT_ULL(62) -#define LBR_INFO_ABORT BIT_ULL(61) -#define LBR_INFO_CYCLES 0xffff - -#define MSR_IA32_PEBS_ENABLE 0x000003f1 -#define MSR_IA32_DS_AREA 0x00000600 -#define MSR_IA32_PERF_CAPABILITIES 0x00000345 -#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 - -#define MSR_IA32_RTIT_CTL 0x00000570 -#define MSR_IA32_RTIT_STATUS 0x00000571 -#define MSR_IA32_RTIT_ADDR0_A 0x00000580 -#define MSR_IA32_RTIT_ADDR0_B 0x00000581 -#define MSR_IA32_RTIT_ADDR1_A 0x00000582 -#define MSR_IA32_RTIT_ADDR1_B 0x00000583 -#define MSR_IA32_RTIT_ADDR2_A 0x00000584 -#define MSR_IA32_RTIT_ADDR2_B 0x00000585 -#define MSR_IA32_RTIT_ADDR3_A 0x00000586 -#define MSR_IA32_RTIT_ADDR3_B 0x00000587 -#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 -#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 -#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 - -#define MSR_MTRRfix64K_00000 0x00000250 -#define MSR_MTRRfix16K_80000 0x00000258 -#define MSR_MTRRfix16K_A0000 0x00000259 -#define MSR_MTRRfix4K_C0000 0x00000268 -#define MSR_MTRRfix4K_C8000 0x00000269 -#define MSR_MTRRfix4K_D0000 0x0000026a -#define MSR_MTRRfix4K_D8000 0x0000026b -#define MSR_MTRRfix4K_E0000 0x0000026c -#define MSR_MTRRfix4K_E8000 0x0000026d -#define MSR_MTRRfix4K_F0000 0x0000026e -#define MSR_MTRRfix4K_F8000 0x0000026f -#define MSR_MTRRdefType 0x000002ff - -#define MSR_IA32_CR_PAT 0x00000277 - -#define MSR_IA32_DEBUGCTLMSR 0x000001d9 -#define MSR_IA32_LASTBRANCHFROMIP 0x000001db -#define MSR_IA32_LASTBRANCHTOIP 0x000001dc -#define MSR_IA32_LASTINTFROMIP 0x000001dd -#define MSR_IA32_LASTINTTOIP 0x000001de - -/* DEBUGCTLMSR bits (others vary by model): */ -#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ -#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ -#define DEBUGCTLMSR_TR (1UL << 6) -#define DEBUGCTLMSR_BTS (1UL << 7) -#define DEBUGCTLMSR_BTINT (1UL << 8) -#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) -#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) -#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) - -#define MSR_PEBS_FRONTEND 0x000003f7 - -#define MSR_IA32_POWER_CTL 0x000001fc - -#define MSR_IA32_MC0_CTL 0x00000400 -#define MSR_IA32_MC0_STATUS 0x00000401 -#define MSR_IA32_MC0_ADDR 0x00000402 -#define MSR_IA32_MC0_MISC 0x00000403 - -/* C-state Residency Counters */ -#define MSR_PKG_C3_RESIDENCY 0x000003f8 -#define MSR_PKG_C6_RESIDENCY 0x000003f9 -#define MSR_PKG_C7_RESIDENCY 0x000003fa -#define MSR_CORE_C3_RESIDENCY 0x000003fc -#define MSR_CORE_C6_RESIDENCY 0x000003fd -#define MSR_CORE_C7_RESIDENCY 0x000003fe -#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff -#define MSR_PKG_C2_RESIDENCY 0x0000060d -#define MSR_PKG_C8_RESIDENCY 0x00000630 -#define MSR_PKG_C9_RESIDENCY 0x00000631 -#define MSR_PKG_C10_RESIDENCY 0x00000632 - -/* Interrupt Response Limit */ -#define MSR_PKGC3_IRTL 0x0000060a -#define MSR_PKGC6_IRTL 0x0000060b -#define MSR_PKGC7_IRTL 0x0000060c -#define MSR_PKGC8_IRTL 0x00000633 -#define MSR_PKGC9_IRTL 0x00000634 -#define MSR_PKGC10_IRTL 0x00000635 - -/* Run Time Average Power Limiting (RAPL) Interface */ - -#define MSR_RAPL_POWER_UNIT 0x00000606 - -#define MSR_PKG_POWER_LIMIT 0x00000610 -#define MSR_PKG_ENERGY_STATUS 0x00000611 -#define MSR_PKG_PERF_STATUS 0x00000613 -#define MSR_PKG_POWER_INFO 0x00000614 - -#define MSR_DRAM_POWER_LIMIT 0x00000618 -#define MSR_DRAM_ENERGY_STATUS 0x00000619 -#define MSR_DRAM_PERF_STATUS 0x0000061b -#define MSR_DRAM_POWER_INFO 0x0000061c - -#define MSR_PP0_POWER_LIMIT 0x00000638 -#define MSR_PP0_ENERGY_STATUS 0x00000639 -#define MSR_PP0_POLICY 0x0000063a -#define MSR_PP0_PERF_STATUS 0x0000063b - -#define MSR_PP1_POWER_LIMIT 0x00000640 -#define MSR_PP1_ENERGY_STATUS 0x00000641 -#define MSR_PP1_POLICY 0x00000642 - -/* Config TDP MSRs */ -#define MSR_CONFIG_TDP_NOMINAL 0x00000648 -#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 -#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A -#define MSR_CONFIG_TDP_CONTROL 0x0000064B -#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C - -#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D - -#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 -#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 -#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A -#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B - -#define MSR_CORE_C1_RES 0x00000660 - -#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 -#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 - -#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 -#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 -#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 - -/* Hardware P state interface */ -#define MSR_PPERF 0x0000064e -#define MSR_PERF_LIMIT_REASONS 0x0000064f -#define MSR_PM_ENABLE 0x00000770 -#define MSR_HWP_CAPABILITIES 0x00000771 -#define MSR_HWP_REQUEST_PKG 0x00000772 -#define MSR_HWP_INTERRUPT 0x00000773 -#define MSR_HWP_REQUEST 0x00000774 -#define MSR_HWP_STATUS 0x00000777 - -/* CPUID.6.EAX */ -#define HWP_BASE_BIT (1<<7) -#define HWP_NOTIFICATIONS_BIT (1<<8) -#define HWP_ACTIVITY_WINDOW_BIT (1<<9) -#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) -#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) - -/* IA32_HWP_CAPABILITIES */ -#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) -#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) -#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) -#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) - -/* IA32_HWP_REQUEST */ -#define HWP_MIN_PERF(x) (x & 0xff) -#define HWP_MAX_PERF(x) ((x & 0xff) << 8) -#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) -#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) -#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) -#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) - -/* IA32_HWP_STATUS */ -#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) - -/* IA32_HWP_INTERRUPT */ -#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) - -#define MSR_AMD64_MC0_MASK 0xc0010044 - -#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) -#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) -#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) -#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) - -#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) - -/* These are consecutive and not in the normal 4er MCE bank block */ -#define MSR_IA32_MC0_CTL2 0x00000280 -#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) - -#define MSR_P6_PERFCTR0 0x000000c1 -#define MSR_P6_PERFCTR1 0x000000c2 -#define MSR_P6_EVNTSEL0 0x00000186 -#define MSR_P6_EVNTSEL1 0x00000187 - -#define MSR_KNC_PERFCTR0 0x00000020 -#define MSR_KNC_PERFCTR1 0x00000021 -#define MSR_KNC_EVNTSEL0 0x00000028 -#define MSR_KNC_EVNTSEL1 0x00000029 - -/* Alternative perfctr range with full access. */ -#define MSR_IA32_PMC0 0x000004c1 - -/* AMD64 MSRs. Not complete. See the architecture manual for a more - complete list. */ - -#define MSR_AMD64_PATCH_LEVEL 0x0000008b -#define MSR_AMD64_TSC_RATIO 0xc0000104 -#define MSR_AMD64_NB_CFG 0xc001001f -#define MSR_AMD64_PATCH_LOADER 0xc0010020 -#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 -#define MSR_AMD64_OSVW_STATUS 0xc0010141 -#define MSR_AMD64_LS_CFG 0xc0011020 -#define MSR_AMD64_DC_CFG 0xc0011022 -#define MSR_AMD64_BU_CFG2 0xc001102a -#define MSR_AMD64_IBSFETCHCTL 0xc0011030 -#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 -#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 -#define MSR_AMD64_IBSFETCH_REG_COUNT 3 -#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) -#define MSR_AMD64_IBSOPCTL 0xc0011033 -#define MSR_AMD64_IBSOPRIP 0xc0011034 -#define MSR_AMD64_IBSOPDATA 0xc0011035 -#define MSR_AMD64_IBSOPDATA2 0xc0011036 -#define MSR_AMD64_IBSOPDATA3 0xc0011037 -#define MSR_AMD64_IBSDCLINAD 0xc0011038 -#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 -#define MSR_AMD64_IBSOP_REG_COUNT 7 -#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) -#define MSR_AMD64_IBSCTL 0xc001103a -#define MSR_AMD64_IBSBRTARGET 0xc001103b -#define MSR_AMD64_IBSOPDATA4 0xc001103d -#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ - -/* Fam 17h MSRs */ -#define MSR_F17H_IRPERF 0xc00000e9 - -/* Fam 16h MSRs */ -#define MSR_F16H_L2I_PERF_CTL 0xc0010230 -#define MSR_F16H_L2I_PERF_CTR 0xc0010231 -#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 -#define MSR_F16H_DR2_ADDR_MASK 0xc001101a -#define MSR_F16H_DR3_ADDR_MASK 0xc001101b -#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 - -/* Fam 15h MSRs */ -#define MSR_F15H_PERF_CTL 0xc0010200 -#define MSR_F15H_PERF_CTR 0xc0010201 -#define MSR_F15H_NB_PERF_CTL 0xc0010240 -#define MSR_F15H_NB_PERF_CTR 0xc0010241 -#define MSR_F15H_PTSC 0xc0010280 -#define MSR_F15H_IC_CFG 0xc0011021 - -/* Fam 10h MSRs */ -#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 -#define FAM10H_MMIO_CONF_ENABLE (1<<0) -#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf -#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 -#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL -#define FAM10H_MMIO_CONF_BASE_SHIFT 20 -#define MSR_FAM10H_NODE_ID 0xc001100c - -/* K8 MSRs */ -#define MSR_K8_TOP_MEM1 0xc001001a -#define MSR_K8_TOP_MEM2 0xc001001d -#define MSR_K8_SYSCFG 0xc0010010 -#define MSR_K8_INT_PENDING_MSG 0xc0010055 -/* C1E active bits in int pending message */ -#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 -#define MSR_K8_TSEG_ADDR 0xc0010112 -#define MSR_K8_TSEG_MASK 0xc0010113 -#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ -#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ -#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ - -/* K7 MSRs */ -#define MSR_K7_EVNTSEL0 0xc0010000 -#define MSR_K7_PERFCTR0 0xc0010004 -#define MSR_K7_EVNTSEL1 0xc0010001 -#define MSR_K7_PERFCTR1 0xc0010005 -#define MSR_K7_EVNTSEL2 0xc0010002 -#define MSR_K7_PERFCTR2 0xc0010006 -#define MSR_K7_EVNTSEL3 0xc0010003 -#define MSR_K7_PERFCTR3 0xc0010007 -#define MSR_K7_CLK_CTL 0xc001001b -#define MSR_K7_HWCR 0xc0010015 -#define MSR_K7_FID_VID_CTL 0xc0010041 -#define MSR_K7_FID_VID_STATUS 0xc0010042 - -/* K6 MSRs */ -#define MSR_K6_WHCR 0xc0000082 -#define MSR_K6_UWCCR 0xc0000085 -#define MSR_K6_EPMR 0xc0000086 -#define MSR_K6_PSOR 0xc0000087 -#define MSR_K6_PFIR 0xc0000088 - -/* Centaur-Hauls/IDT defined MSRs. */ -#define MSR_IDT_FCR1 0x00000107 -#define MSR_IDT_FCR2 0x00000108 -#define MSR_IDT_FCR3 0x00000109 -#define MSR_IDT_FCR4 0x0000010a - -#define MSR_IDT_MCR0 0x00000110 -#define MSR_IDT_MCR1 0x00000111 -#define MSR_IDT_MCR2 0x00000112 -#define MSR_IDT_MCR3 0x00000113 -#define MSR_IDT_MCR4 0x00000114 -#define MSR_IDT_MCR5 0x00000115 -#define MSR_IDT_MCR6 0x00000116 -#define MSR_IDT_MCR7 0x00000117 -#define MSR_IDT_MCR_CTRL 0x00000120 - -/* VIA Cyrix defined MSRs*/ -#define MSR_VIA_FCR 0x00001107 -#define MSR_VIA_LONGHAUL 0x0000110a -#define MSR_VIA_RNG 0x0000110b -#define MSR_VIA_BCR2 0x00001147 - -/* Transmeta defined MSRs */ -#define MSR_TMTA_LONGRUN_CTRL 0x80868010 -#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 -#define MSR_TMTA_LRTI_READOUT 0x80868018 -#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a - -/* Intel defined MSRs. */ -#define MSR_IA32_P5_MC_ADDR 0x00000000 -#define MSR_IA32_P5_MC_TYPE 0x00000001 -#define MSR_IA32_TSC 0x00000010 -#define MSR_IA32_PLATFORM_ID 0x00000017 -#define MSR_IA32_EBL_CR_POWERON 0x0000002a -#define MSR_EBC_FREQUENCY_ID 0x0000002c -#define MSR_SMI_COUNT 0x00000034 -#define MSR_IA32_FEATURE_CONTROL 0x0000003a -#define MSR_IA32_TSC_ADJUST 0x0000003b -#define MSR_IA32_BNDCFGS 0x00000d90 - -#define MSR_IA32_XSS 0x00000da0 - -#define FEATURE_CONTROL_LOCKED (1<<0) -#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) -#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) -#define FEATURE_CONTROL_LMCE (1<<20) - -#define MSR_IA32_APICBASE 0x0000001b -#define MSR_IA32_APICBASE_BSP (1<<8) -#define MSR_IA32_APICBASE_ENABLE (1<<11) -#define MSR_IA32_APICBASE_BASE (0xfffff<<12) - -#define MSR_IA32_TSCDEADLINE 0x000006e0 - -#define MSR_IA32_UCODE_WRITE 0x00000079 -#define MSR_IA32_UCODE_REV 0x0000008b - -#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b -#define MSR_IA32_SMBASE 0x0000009e - -#define MSR_IA32_PERF_STATUS 0x00000198 -#define MSR_IA32_PERF_CTL 0x00000199 -#define INTEL_PERF_CTL_MASK 0xffff -#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 -#define MSR_AMD_PERF_STATUS 0xc0010063 -#define MSR_AMD_PERF_CTL 0xc0010062 - -#define MSR_IA32_MPERF 0x000000e7 -#define MSR_IA32_APERF 0x000000e8 - -#define MSR_IA32_THERM_CONTROL 0x0000019a -#define MSR_IA32_THERM_INTERRUPT 0x0000019b - -#define THERM_INT_HIGH_ENABLE (1 << 0) -#define THERM_INT_LOW_ENABLE (1 << 1) -#define THERM_INT_PLN_ENABLE (1 << 24) - -#define MSR_IA32_THERM_STATUS 0x0000019c - -#define THERM_STATUS_PROCHOT (1 << 0) -#define THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_THERM2_CTL 0x0000019d - -#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) - -#define MSR_IA32_MISC_ENABLE 0x000001a0 - -#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 - -#define MSR_MISC_PWR_MGMT 0x000001aa - -#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 -#define ENERGY_PERF_BIAS_PERFORMANCE 0 -#define ENERGY_PERF_BIAS_NORMAL 6 -#define ENERGY_PERF_BIAS_POWERSAVE 15 - -#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 - -#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) -#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 - -#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) -#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) -#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) - -/* Thermal Thresholds Support */ -#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) -#define THERM_SHIFT_THRESHOLD0 8 -#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) -#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) -#define THERM_SHIFT_THRESHOLD1 16 -#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) -#define THERM_STATUS_THRESHOLD0 (1 << 6) -#define THERM_LOG_THRESHOLD0 (1 << 7) -#define THERM_STATUS_THRESHOLD1 (1 << 8) -#define THERM_LOG_THRESHOLD1 (1 << 9) - -/* MISC_ENABLE bits: architectural */ -#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 -#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) -#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 -#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) -#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 -#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) -#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 -#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 -#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) - -/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ -#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 -#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) -#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 -#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) -#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 -#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) - -#define MSR_IA32_TSC_DEADLINE 0x000006E0 - -/* P4/Xeon+ specific */ -#define MSR_IA32_MCG_EAX 0x00000180 -#define MSR_IA32_MCG_EBX 0x00000181 -#define MSR_IA32_MCG_ECX 0x00000182 -#define MSR_IA32_MCG_EDX 0x00000183 -#define MSR_IA32_MCG_ESI 0x00000184 -#define MSR_IA32_MCG_EDI 0x00000185 -#define MSR_IA32_MCG_EBP 0x00000186 -#define MSR_IA32_MCG_ESP 0x00000187 -#define MSR_IA32_MCG_EFLAGS 0x00000188 -#define MSR_IA32_MCG_EIP 0x00000189 -#define MSR_IA32_MCG_RESERVED 0x0000018a - -/* Pentium IV performance counter MSRs */ -#define MSR_P4_BPU_PERFCTR0 0x00000300 -#define MSR_P4_BPU_PERFCTR1 0x00000301 -#define MSR_P4_BPU_PERFCTR2 0x00000302 -#define MSR_P4_BPU_PERFCTR3 0x00000303 -#define MSR_P4_MS_PERFCTR0 0x00000304 -#define MSR_P4_MS_PERFCTR1 0x00000305 -#define MSR_P4_MS_PERFCTR2 0x00000306 -#define MSR_P4_MS_PERFCTR3 0x00000307 -#define MSR_P4_FLAME_PERFCTR0 0x00000308 -#define MSR_P4_FLAME_PERFCTR1 0x00000309 -#define MSR_P4_FLAME_PERFCTR2 0x0000030a -#define MSR_P4_FLAME_PERFCTR3 0x0000030b -#define MSR_P4_IQ_PERFCTR0 0x0000030c -#define MSR_P4_IQ_PERFCTR1 0x0000030d -#define MSR_P4_IQ_PERFCTR2 0x0000030e -#define MSR_P4_IQ_PERFCTR3 0x0000030f -#define MSR_P4_IQ_PERFCTR4 0x00000310 -#define MSR_P4_IQ_PERFCTR5 0x00000311 -#define MSR_P4_BPU_CCCR0 0x00000360 -#define MSR_P4_BPU_CCCR1 0x00000361 -#define MSR_P4_BPU_CCCR2 0x00000362 -#define MSR_P4_BPU_CCCR3 0x00000363 -#define MSR_P4_MS_CCCR0 0x00000364 -#define MSR_P4_MS_CCCR1 0x00000365 -#define MSR_P4_MS_CCCR2 0x00000366 -#define MSR_P4_MS_CCCR3 0x00000367 -#define MSR_P4_FLAME_CCCR0 0x00000368 -#define MSR_P4_FLAME_CCCR1 0x00000369 -#define MSR_P4_FLAME_CCCR2 0x0000036a -#define MSR_P4_FLAME_CCCR3 0x0000036b -#define MSR_P4_IQ_CCCR0 0x0000036c -#define MSR_P4_IQ_CCCR1 0x0000036d -#define MSR_P4_IQ_CCCR2 0x0000036e -#define MSR_P4_IQ_CCCR3 0x0000036f -#define MSR_P4_IQ_CCCR4 0x00000370 -#define MSR_P4_IQ_CCCR5 0x00000371 -#define MSR_P4_ALF_ESCR0 0x000003ca -#define MSR_P4_ALF_ESCR1 0x000003cb -#define MSR_P4_BPU_ESCR0 0x000003b2 -#define MSR_P4_BPU_ESCR1 0x000003b3 -#define MSR_P4_BSU_ESCR0 0x000003a0 -#define MSR_P4_BSU_ESCR1 0x000003a1 -#define MSR_P4_CRU_ESCR0 0x000003b8 -#define MSR_P4_CRU_ESCR1 0x000003b9 -#define MSR_P4_CRU_ESCR2 0x000003cc -#define MSR_P4_CRU_ESCR3 0x000003cd -#define MSR_P4_CRU_ESCR4 0x000003e0 -#define MSR_P4_CRU_ESCR5 0x000003e1 -#define MSR_P4_DAC_ESCR0 0x000003a8 -#define MSR_P4_DAC_ESCR1 0x000003a9 -#define MSR_P4_FIRM_ESCR0 0x000003a4 -#define MSR_P4_FIRM_ESCR1 0x000003a5 -#define MSR_P4_FLAME_ESCR0 0x000003a6 -#define MSR_P4_FLAME_ESCR1 0x000003a7 -#define MSR_P4_FSB_ESCR0 0x000003a2 -#define MSR_P4_FSB_ESCR1 0x000003a3 -#define MSR_P4_IQ_ESCR0 0x000003ba -#define MSR_P4_IQ_ESCR1 0x000003bb -#define MSR_P4_IS_ESCR0 0x000003b4 -#define MSR_P4_IS_ESCR1 0x000003b5 -#define MSR_P4_ITLB_ESCR0 0x000003b6 -#define MSR_P4_ITLB_ESCR1 0x000003b7 -#define MSR_P4_IX_ESCR0 0x000003c8 -#define MSR_P4_IX_ESCR1 0x000003c9 -#define MSR_P4_MOB_ESCR0 0x000003aa -#define MSR_P4_MOB_ESCR1 0x000003ab -#define MSR_P4_MS_ESCR0 0x000003c0 -#define MSR_P4_MS_ESCR1 0x000003c1 -#define MSR_P4_PMH_ESCR0 0x000003ac -#define MSR_P4_PMH_ESCR1 0x000003ad -#define MSR_P4_RAT_ESCR0 0x000003bc -#define MSR_P4_RAT_ESCR1 0x000003bd -#define MSR_P4_SAAT_ESCR0 0x000003ae -#define MSR_P4_SAAT_ESCR1 0x000003af -#define MSR_P4_SSU_ESCR0 0x000003be -#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ - -#define MSR_P4_TBPU_ESCR0 0x000003c2 -#define MSR_P4_TBPU_ESCR1 0x000003c3 -#define MSR_P4_TC_ESCR0 0x000003c4 -#define MSR_P4_TC_ESCR1 0x000003c5 -#define MSR_P4_U2L_ESCR0 0x000003b0 -#define MSR_P4_U2L_ESCR1 0x000003b1 - -#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 - -/* Intel Core-based CPU performance counters */ -#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 -#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a -#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b -#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d -#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e -#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f -#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 - -/* Geode defined MSRs */ -#define MSR_GEODE_BUSCONT_CONF0 0x00001900 - -/* Intel VT MSRs */ -#define MSR_IA32_VMX_BASIC 0x00000480 -#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 -#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 -#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 -#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 -#define MSR_IA32_VMX_MISC 0x00000485 -#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 -#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 -#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 -#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 -#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a -#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b -#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c -#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d -#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e -#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f -#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 -#define MSR_IA32_VMX_VMFUNC 0x00000491 - -/* VMX_BASIC bits and bitmasks */ -#define VMX_BASIC_VMCS_SIZE_SHIFT 32 -#define VMX_BASIC_TRUE_CTLS (1ULL << 55) -#define VMX_BASIC_64 0x0001000000000000LLU -#define VMX_BASIC_MEM_TYPE_SHIFT 50 -#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU -#define VMX_BASIC_MEM_TYPE_WB 6LLU -#define VMX_BASIC_INOUT 0x0040000000000000LLU - -/* MSR_IA32_VMX_MISC bits */ -#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) -#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F -/* AMD-V MSRs */ - -#define MSR_VM_CR 0xc0010114 -#define MSR_VM_IGNNE 0xc0010115 -#define MSR_VM_HSAVE_PA 0xc0010117 +#include <uapi/asm/msr-index.h> #endif /* _ASM_X86_MSR_INDEX_H */ diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h new file mode 100644 index 000000000000..d097e832ee3c --- /dev/null +++ b/arch/x86/include/uapi/asm/msr-index.h @@ -0,0 +1,698 @@ +#ifndef _UAPI_ASM_X86_MSR_INDEX_H +#define _UAPI_ASM_X86_MSR_INDEX_H + +/* + * CPU model specific register (MSR) numbers. + * + * Do not add new entries to this file unless the definitions are shared + * between multiple compilation units. + */ + +/* x86-64 specific MSRs */ +#define MSR_EFER 0xc0000080 /* extended feature register */ +#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ +#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ +#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ +#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ +#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ +#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ +#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ +#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ + +/* EFER bits: */ +#define _EFER_SCE 0 /* SYSCALL/SYSRET */ +#define _EFER_LME 8 /* Long mode enable */ +#define _EFER_LMA 10 /* Long mode active (read-only) */ +#define _EFER_NX 11 /* No execute enable */ +#define _EFER_SVME 12 /* Enable virtualization */ +#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ +#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ + +#define EFER_SCE (1<<_EFER_SCE) +#define EFER_LME (1<<_EFER_LME) +#define EFER_LMA (1<<_EFER_LMA) +#define EFER_NX (1<<_EFER_NX) +#define EFER_SVME (1<<_EFER_SVME) +#define EFER_LMSLE (1<<_EFER_LMSLE) +#define EFER_FFXSR (1<<_EFER_FFXSR) + +/* Intel MSRs. Some also available on other CPUs */ + +#define MSR_PPIN_CTL 0x0000004e +#define MSR_PPIN 0x0000004f + +#define MSR_IA32_PERFCTR0 0x000000c1 +#define MSR_IA32_PERFCTR1 0x000000c2 +#define MSR_FSB_FREQ 0x000000cd +#define MSR_PLATFORM_INFO 0x000000ce + +#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 +#define NHM_C3_AUTO_DEMOTE (1UL << 25) +#define NHM_C1_AUTO_DEMOTE (1UL << 26) +#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) +#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) +#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) + +#define MSR_MTRRcap 0x000000fe +#define MSR_IA32_BBL_CR_CTL 0x00000119 +#define MSR_IA32_BBL_CR_CTL3 0x0000011e + +#define MSR_IA32_SYSENTER_CS 0x00000174 +#define MSR_IA32_SYSENTER_ESP 0x00000175 +#define MSR_IA32_SYSENTER_EIP 0x00000176 + +#define MSR_IA32_MCG_CAP 0x00000179 +#define MSR_IA32_MCG_STATUS 0x0000017a +#define MSR_IA32_MCG_CTL 0x0000017b +#define MSR_IA32_MCG_EXT_CTL 0x000004d0 + +#define MSR_OFFCORE_RSP_0 0x000001a6 +#define MSR_OFFCORE_RSP_1 0x000001a7 +#define MSR_TURBO_RATIO_LIMIT 0x000001ad +#define MSR_TURBO_RATIO_LIMIT1 0x000001ae +#define MSR_TURBO_RATIO_LIMIT2 0x000001af + +#define MSR_LBR_SELECT 0x000001c8 +#define MSR_LBR_TOS 0x000001c9 +#define MSR_LBR_NHM_FROM 0x00000680 +#define MSR_LBR_NHM_TO 0x000006c0 +#define MSR_LBR_CORE_FROM 0x00000040 +#define MSR_LBR_CORE_TO 0x00000060 + +#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ +#define LBR_INFO_MISPRED BIT_ULL(63) +#define LBR_INFO_IN_TX BIT_ULL(62) +#define LBR_INFO_ABORT BIT_ULL(61) +#define LBR_INFO_CYCLES 0xffff + +#define MSR_IA32_PEBS_ENABLE 0x000003f1 +#define MSR_IA32_DS_AREA 0x00000600 +#define MSR_IA32_PERF_CAPABILITIES 0x00000345 +#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 + +#define MSR_IA32_RTIT_CTL 0x00000570 +#define MSR_IA32_RTIT_STATUS 0x00000571 +#define MSR_IA32_RTIT_ADDR0_A 0x00000580 +#define MSR_IA32_RTIT_ADDR0_B 0x00000581 +#define MSR_IA32_RTIT_ADDR1_A 0x00000582 +#define MSR_IA32_RTIT_ADDR1_B 0x00000583 +#define MSR_IA32_RTIT_ADDR2_A 0x00000584 +#define MSR_IA32_RTIT_ADDR2_B 0x00000585 +#define MSR_IA32_RTIT_ADDR3_A 0x00000586 +#define MSR_IA32_RTIT_ADDR3_B 0x00000587 +#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 +#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 +#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 + +#define MSR_MTRRfix64K_00000 0x00000250 +#define MSR_MTRRfix16K_80000 0x00000258 +#define MSR_MTRRfix16K_A0000 0x00000259 +#define MSR_MTRRfix4K_C0000 0x00000268 +#define MSR_MTRRfix4K_C8000 0x00000269 +#define MSR_MTRRfix4K_D0000 0x0000026a +#define MSR_MTRRfix4K_D8000 0x0000026b +#define MSR_MTRRfix4K_E0000 0x0000026c +#define MSR_MTRRfix4K_E8000 0x0000026d +#define MSR_MTRRfix4K_F0000 0x0000026e +#define MSR_MTRRfix4K_F8000 0x0000026f +#define MSR_MTRRdefType 0x000002ff + +#define MSR_IA32_CR_PAT 0x00000277 + +#define MSR_IA32_DEBUGCTLMSR 0x000001d9 +#define MSR_IA32_LASTBRANCHFROMIP 0x000001db +#define MSR_IA32_LASTBRANCHTOIP 0x000001dc +#define MSR_IA32_LASTINTFROMIP 0x000001dd +#define MSR_IA32_LASTINTTOIP 0x000001de + +/* DEBUGCTLMSR bits (others vary by model): */ +#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ +#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ +#define DEBUGCTLMSR_TR (1UL << 6) +#define DEBUGCTLMSR_BTS (1UL << 7) +#define DEBUGCTLMSR_BTINT (1UL << 8) +#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) +#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) +#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) + +#define MSR_PEBS_FRONTEND 0x000003f7 + +#define MSR_IA32_POWER_CTL 0x000001fc + +#define MSR_IA32_MC0_CTL 0x00000400 +#define MSR_IA32_MC0_STATUS 0x00000401 +#define MSR_IA32_MC0_ADDR 0x00000402 +#define MSR_IA32_MC0_MISC 0x00000403 + +/* C-state Residency Counters */ +#define MSR_PKG_C3_RESIDENCY 0x000003f8 +#define MSR_PKG_C6_RESIDENCY 0x000003f9 +#define MSR_PKG_C7_RESIDENCY 0x000003fa +#define MSR_CORE_C3_RESIDENCY 0x000003fc +#define MSR_CORE_C6_RESIDENCY 0x000003fd +#define MSR_CORE_C7_RESIDENCY 0x000003fe +#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff +#define MSR_PKG_C2_RESIDENCY 0x0000060d +#define MSR_PKG_C8_RESIDENCY 0x00000630 +#define MSR_PKG_C9_RESIDENCY 0x00000631 +#define MSR_PKG_C10_RESIDENCY 0x00000632 + +/* Interrupt Response Limit */ +#define MSR_PKGC3_IRTL 0x0000060a +#define MSR_PKGC6_IRTL 0x0000060b +#define MSR_PKGC7_IRTL 0x0000060c +#define MSR_PKGC8_IRTL 0x00000633 +#define MSR_PKGC9_IRTL 0x00000634 +#define MSR_PKGC10_IRTL 0x00000635 + +/* Run Time Average Power Limiting (RAPL) Interface */ + +#define MSR_RAPL_POWER_UNIT 0x00000606 + +#define MSR_PKG_POWER_LIMIT 0x00000610 +#define MSR_PKG_ENERGY_STATUS 0x00000611 +#define MSR_PKG_PERF_STATUS 0x00000613 +#define MSR_PKG_POWER_INFO 0x00000614 + +#define MSR_DRAM_POWER_LIMIT 0x00000618 +#define MSR_DRAM_ENERGY_STATUS 0x00000619 +#define MSR_DRAM_PERF_STATUS 0x0000061b +#define MSR_DRAM_POWER_INFO 0x0000061c + +#define MSR_PP0_POWER_LIMIT 0x00000638 +#define MSR_PP0_ENERGY_STATUS 0x00000639 +#define MSR_PP0_POLICY 0x0000063a +#define MSR_PP0_PERF_STATUS 0x0000063b + +#define MSR_PP1_POWER_LIMIT 0x00000640 +#define MSR_PP1_ENERGY_STATUS 0x00000641 +#define MSR_PP1_POLICY 0x00000642 + +/* Config TDP MSRs */ +#define MSR_CONFIG_TDP_NOMINAL 0x00000648 +#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 +#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A +#define MSR_CONFIG_TDP_CONTROL 0x0000064B +#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C + +#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D + +#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 +#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 +#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A +#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B + +#define MSR_CORE_C1_RES 0x00000660 + +#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 +#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 + +#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 +#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 +#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 + +/* Hardware P state interface */ +#define MSR_PPERF 0x0000064e +#define MSR_PERF_LIMIT_REASONS 0x0000064f +#define MSR_PM_ENABLE 0x00000770 +#define MSR_HWP_CAPABILITIES 0x00000771 +#define MSR_HWP_REQUEST_PKG 0x00000772 +#define MSR_HWP_INTERRUPT 0x00000773 +#define MSR_HWP_REQUEST 0x00000774 +#define MSR_HWP_STATUS 0x00000777 + +/* CPUID.6.EAX */ +#define HWP_BASE_BIT (1<<7) +#define HWP_NOTIFICATIONS_BIT (1<<8) +#define HWP_ACTIVITY_WINDOW_BIT (1<<9) +#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) +#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) + +/* IA32_HWP_CAPABILITIES */ +#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) +#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) +#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) +#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) + +/* IA32_HWP_REQUEST */ +#define HWP_MIN_PERF(x) (x & 0xff) +#define HWP_MAX_PERF(x) ((x & 0xff) << 8) +#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) +#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) +#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) +#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) + +/* IA32_HWP_STATUS */ +#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) + +/* IA32_HWP_INTERRUPT */ +#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) + +#define MSR_AMD64_MC0_MASK 0xc0010044 + +#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) +#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) +#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) +#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) + +#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) + +/* These are consecutive and not in the normal 4er MCE bank block */ +#define MSR_IA32_MC0_CTL2 0x00000280 +#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) + +#define MSR_P6_PERFCTR0 0x000000c1 +#define MSR_P6_PERFCTR1 0x000000c2 +#define MSR_P6_EVNTSEL0 0x00000186 +#define MSR_P6_EVNTSEL1 0x00000187 + +#define MSR_KNC_PERFCTR0 0x00000020 +#define MSR_KNC_PERFCTR1 0x00000021 +#define MSR_KNC_EVNTSEL0 0x00000028 +#define MSR_KNC_EVNTSEL1 0x00000029 + +/* Alternative perfctr range with full access. */ +#define MSR_IA32_PMC0 0x000004c1 + +/* AMD64 MSRs. Not complete. See the architecture manual for a more + complete list. */ + +#define MSR_AMD64_PATCH_LEVEL 0x0000008b +#define MSR_AMD64_TSC_RATIO 0xc0000104 +#define MSR_AMD64_NB_CFG 0xc001001f +#define MSR_AMD64_PATCH_LOADER 0xc0010020 +#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 +#define MSR_AMD64_OSVW_STATUS 0xc0010141 +#define MSR_AMD64_LS_CFG 0xc0011020 +#define MSR_AMD64_DC_CFG 0xc0011022 +#define MSR_AMD64_BU_CFG2 0xc001102a +#define MSR_AMD64_IBSFETCHCTL 0xc0011030 +#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 +#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 +#define MSR_AMD64_IBSFETCH_REG_COUNT 3 +#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) +#define MSR_AMD64_IBSOPCTL 0xc0011033 +#define MSR_AMD64_IBSOPRIP 0xc0011034 +#define MSR_AMD64_IBSOPDATA 0xc0011035 +#define MSR_AMD64_IBSOPDATA2 0xc0011036 +#define MSR_AMD64_IBSOPDATA3 0xc0011037 +#define MSR_AMD64_IBSDCLINAD 0xc0011038 +#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 +#define MSR_AMD64_IBSOP_REG_COUNT 7 +#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) +#define MSR_AMD64_IBSCTL 0xc001103a +#define MSR_AMD64_IBSBRTARGET 0xc001103b +#define MSR_AMD64_IBSOPDATA4 0xc001103d +#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ + +/* Fam 17h MSRs */ +#define MSR_F17H_IRPERF 0xc00000e9 + +/* Fam 16h MSRs */ +#define MSR_F16H_L2I_PERF_CTL 0xc0010230 +#define MSR_F16H_L2I_PERF_CTR 0xc0010231 +#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 +#define MSR_F16H_DR2_ADDR_MASK 0xc001101a +#define MSR_F16H_DR3_ADDR_MASK 0xc001101b +#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 + +/* Fam 15h MSRs */ +#define MSR_F15H_PERF_CTL 0xc0010200 +#define MSR_F15H_PERF_CTR 0xc0010201 +#define MSR_F15H_NB_PERF_CTL 0xc0010240 +#define MSR_F15H_NB_PERF_CTR 0xc0010241 +#define MSR_F15H_PTSC 0xc0010280 +#define MSR_F15H_IC_CFG 0xc0011021 + +/* Fam 10h MSRs */ +#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 +#define FAM10H_MMIO_CONF_ENABLE (1<<0) +#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf +#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 +#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL +#define FAM10H_MMIO_CONF_BASE_SHIFT 20 +#define MSR_FAM10H_NODE_ID 0xc001100c + +/* K8 MSRs */ +#define MSR_K8_TOP_MEM1 0xc001001a +#define MSR_K8_TOP_MEM2 0xc001001d +#define MSR_K8_SYSCFG 0xc0010010 +#define MSR_K8_INT_PENDING_MSG 0xc0010055 +/* C1E active bits in int pending message */ +#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 +#define MSR_K8_TSEG_ADDR 0xc0010112 +#define MSR_K8_TSEG_MASK 0xc0010113 +#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ +#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ +#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ + +/* K7 MSRs */ +#define MSR_K7_EVNTSEL0 0xc0010000 +#define MSR_K7_PERFCTR0 0xc0010004 +#define MSR_K7_EVNTSEL1 0xc0010001 +#define MSR_K7_PERFCTR1 0xc0010005 +#define MSR_K7_EVNTSEL2 0xc0010002 +#define MSR_K7_PERFCTR2 0xc0010006 +#define MSR_K7_EVNTSEL3 0xc0010003 +#define MSR_K7_PERFCTR3 0xc0010007 +#define MSR_K7_CLK_CTL 0xc001001b +#define MSR_K7_HWCR 0xc0010015 +#define MSR_K7_FID_VID_CTL 0xc0010041 +#define MSR_K7_FID_VID_STATUS 0xc0010042 + +/* K6 MSRs */ +#define MSR_K6_WHCR 0xc0000082 +#define MSR_K6_UWCCR 0xc0000085 +#define MSR_K6_EPMR 0xc0000086 +#define MSR_K6_PSOR 0xc0000087 +#define MSR_K6_PFIR 0xc0000088 + +/* Centaur-Hauls/IDT defined MSRs. */ +#define MSR_IDT_FCR1 0x00000107 +#define MSR_IDT_FCR2 0x00000108 +#define MSR_IDT_FCR3 0x00000109 +#define MSR_IDT_FCR4 0x0000010a + +#define MSR_IDT_MCR0 0x00000110 +#define MSR_IDT_MCR1 0x00000111 +#define MSR_IDT_MCR2 0x00000112 +#define MSR_IDT_MCR3 0x00000113 +#define MSR_IDT_MCR4 0x00000114 +#define MSR_IDT_MCR5 0x00000115 +#define MSR_IDT_MCR6 0x00000116 +#define MSR_IDT_MCR7 0x00000117 +#define MSR_IDT_MCR_CTRL 0x00000120 + +/* VIA Cyrix defined MSRs*/ +#define MSR_VIA_FCR 0x00001107 +#define MSR_VIA_LONGHAUL 0x0000110a +#define MSR_VIA_RNG 0x0000110b +#define MSR_VIA_BCR2 0x00001147 + +/* Transmeta defined MSRs */ +#define MSR_TMTA_LONGRUN_CTRL 0x80868010 +#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 +#define MSR_TMTA_LRTI_READOUT 0x80868018 +#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a + +/* Intel defined MSRs. */ +#define MSR_IA32_P5_MC_ADDR 0x00000000 +#define MSR_IA32_P5_MC_TYPE 0x00000001 +#define MSR_IA32_TSC 0x00000010 +#define MSR_IA32_PLATFORM_ID 0x00000017 +#define MSR_IA32_EBL_CR_POWERON 0x0000002a +#define MSR_EBC_FREQUENCY_ID 0x0000002c +#define MSR_SMI_COUNT 0x00000034 +#define MSR_IA32_FEATURE_CONTROL 0x0000003a +#define MSR_IA32_TSC_ADJUST 0x0000003b +#define MSR_IA32_BNDCFGS 0x00000d90 + +#define MSR_IA32_XSS 0x00000da0 + +#define FEATURE_CONTROL_LOCKED (1<<0) +#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) +#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) +#define FEATURE_CONTROL_LMCE (1<<20) + +#define MSR_IA32_APICBASE 0x0000001b +#define MSR_IA32_APICBASE_BSP (1<<8) +#define MSR_IA32_APICBASE_ENABLE (1<<11) +#define MSR_IA32_APICBASE_BASE (0xfffff<<12) + +#define MSR_IA32_TSCDEADLINE 0x000006e0 + +#define MSR_IA32_UCODE_WRITE 0x00000079 +#define MSR_IA32_UCODE_REV 0x0000008b + +#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b +#define MSR_IA32_SMBASE 0x0000009e + +#define MSR_IA32_PERF_STATUS 0x00000198 +#define MSR_IA32_PERF_CTL 0x00000199 +#define INTEL_PERF_CTL_MASK 0xffff +#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 +#define MSR_AMD_PERF_STATUS 0xc0010063 +#define MSR_AMD_PERF_CTL 0xc0010062 + +#define MSR_IA32_MPERF 0x000000e7 +#define MSR_IA32_APERF 0x000000e8 + +#define MSR_IA32_THERM_CONTROL 0x0000019a +#define MSR_IA32_THERM_INTERRUPT 0x0000019b + +#define THERM_INT_HIGH_ENABLE (1 << 0) +#define THERM_INT_LOW_ENABLE (1 << 1) +#define THERM_INT_PLN_ENABLE (1 << 24) + +#define MSR_IA32_THERM_STATUS 0x0000019c + +#define THERM_STATUS_PROCHOT (1 << 0) +#define THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_THERM2_CTL 0x0000019d + +#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) + +#define MSR_IA32_MISC_ENABLE 0x000001a0 + +#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 + +#define MSR_MISC_PWR_MGMT 0x000001aa + +#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 +#define ENERGY_PERF_BIAS_PERFORMANCE 0 +#define ENERGY_PERF_BIAS_NORMAL 6 +#define ENERGY_PERF_BIAS_POWERSAVE 15 + +#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 + +#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) +#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 + +#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) +#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) +#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) + +/* Thermal Thresholds Support */ +#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) +#define THERM_SHIFT_THRESHOLD0 8 +#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) +#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) +#define THERM_SHIFT_THRESHOLD1 16 +#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) +#define THERM_STATUS_THRESHOLD0 (1 << 6) +#define THERM_LOG_THRESHOLD0 (1 << 7) +#define THERM_STATUS_THRESHOLD1 (1 << 8) +#define THERM_LOG_THRESHOLD1 (1 << 9) + +/* MISC_ENABLE bits: architectural */ +#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 +#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) +#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 +#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) +#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 +#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) +#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 +#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 +#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) + +/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ +#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 +#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) +#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 +#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) +#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 +#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) + +#define MSR_IA32_TSC_DEADLINE 0x000006E0 + +/* P4/Xeon+ specific */ +#define MSR_IA32_MCG_EAX 0x00000180 +#define MSR_IA32_MCG_EBX 0x00000181 +#define MSR_IA32_MCG_ECX 0x00000182 +#define MSR_IA32_MCG_EDX 0x00000183 +#define MSR_IA32_MCG_ESI 0x00000184 +#define MSR_IA32_MCG_EDI 0x00000185 +#define MSR_IA32_MCG_EBP 0x00000186 +#define MSR_IA32_MCG_ESP 0x00000187 +#define MSR_IA32_MCG_EFLAGS 0x00000188 +#define MSR_IA32_MCG_EIP 0x00000189 +#define MSR_IA32_MCG_RESERVED 0x0000018a + +/* Pentium IV performance counter MSRs */ +#define MSR_P4_BPU_PERFCTR0 0x00000300 +#define MSR_P4_BPU_PERFCTR1 0x00000301 +#define MSR_P4_BPU_PERFCTR2 0x00000302 +#define MSR_P4_BPU_PERFCTR3 0x00000303 +#define MSR_P4_MS_PERFCTR0 0x00000304 +#define MSR_P4_MS_PERFCTR1 0x00000305 +#define MSR_P4_MS_PERFCTR2 0x00000306 +#define MSR_P4_MS_PERFCTR3 0x00000307 +#define MSR_P4_FLAME_PERFCTR0 0x00000308 +#define MSR_P4_FLAME_PERFCTR1 0x00000309 +#define MSR_P4_FLAME_PERFCTR2 0x0000030a +#define MSR_P4_FLAME_PERFCTR3 0x0000030b +#define MSR_P4_IQ_PERFCTR0 0x0000030c +#define MSR_P4_IQ_PERFCTR1 0x0000030d +#define MSR_P4_IQ_PERFCTR2 0x0000030e +#define MSR_P4_IQ_PERFCTR3 0x0000030f +#define MSR_P4_IQ_PERFCTR4 0x00000310 +#define MSR_P4_IQ_PERFCTR5 0x00000311 +#define MSR_P4_BPU_CCCR0 0x00000360 +#define MSR_P4_BPU_CCCR1 0x00000361 +#define MSR_P4_BPU_CCCR2 0x00000362 +#define MSR_P4_BPU_CCCR3 0x00000363 +#define MSR_P4_MS_CCCR0 0x00000364 +#define MSR_P4_MS_CCCR1 0x00000365 +#define MSR_P4_MS_CCCR2 0x00000366 +#define MSR_P4_MS_CCCR3 0x00000367 +#define MSR_P4_FLAME_CCCR0 0x00000368 +#define MSR_P4_FLAME_CCCR1 0x00000369 +#define MSR_P4_FLAME_CCCR2 0x0000036a +#define MSR_P4_FLAME_CCCR3 0x0000036b +#define MSR_P4_IQ_CCCR0 0x0000036c +#define MSR_P4_IQ_CCCR1 0x0000036d +#define MSR_P4_IQ_CCCR2 0x0000036e +#define MSR_P4_IQ_CCCR3 0x0000036f +#define MSR_P4_IQ_CCCR4 0x00000370 +#define MSR_P4_IQ_CCCR5 0x00000371 +#define MSR_P4_ALF_ESCR0 0x000003ca +#define MSR_P4_ALF_ESCR1 0x000003cb +#define MSR_P4_BPU_ESCR0 0x000003b2 +#define MSR_P4_BPU_ESCR1 0x000003b3 +#define MSR_P4_BSU_ESCR0 0x000003a0 +#define MSR_P4_BSU_ESCR1 0x000003a1 +#define MSR_P4_CRU_ESCR0 0x000003b8 +#define MSR_P4_CRU_ESCR1 0x000003b9 +#define MSR_P4_CRU_ESCR2 0x000003cc +#define MSR_P4_CRU_ESCR3 0x000003cd +#define MSR_P4_CRU_ESCR4 0x000003e0 +#define MSR_P4_CRU_ESCR5 0x000003e1 +#define MSR_P4_DAC_ESCR0 0x000003a8 +#define MSR_P4_DAC_ESCR1 0x000003a9 +#define MSR_P4_FIRM_ESCR0 0x000003a4 +#define MSR_P4_FIRM_ESCR1 0x000003a5 +#define MSR_P4_FLAME_ESCR0 0x000003a6 +#define MSR_P4_FLAME_ESCR1 0x000003a7 +#define MSR_P4_FSB_ESCR0 0x000003a2 +#define MSR_P4_FSB_ESCR1 0x000003a3 +#define MSR_P4_IQ_ESCR0 0x000003ba +#define MSR_P4_IQ_ESCR1 0x000003bb +#define MSR_P4_IS_ESCR0 0x000003b4 +#define MSR_P4_IS_ESCR1 0x000003b5 +#define MSR_P4_ITLB_ESCR0 0x000003b6 +#define MSR_P4_ITLB_ESCR1 0x000003b7 +#define MSR_P4_IX_ESCR0 0x000003c8 +#define MSR_P4_IX_ESCR1 0x000003c9 +#define MSR_P4_MOB_ESCR0 0x000003aa +#define MSR_P4_MOB_ESCR1 0x000003ab +#define MSR_P4_MS_ESCR0 0x000003c0 +#define MSR_P4_MS_ESCR1 0x000003c1 +#define MSR_P4_PMH_ESCR0 0x000003ac +#define MSR_P4_PMH_ESCR1 0x000003ad +#define MSR_P4_RAT_ESCR0 0x000003bc +#define MSR_P4_RAT_ESCR1 0x000003bd +#define MSR_P4_SAAT_ESCR0 0x000003ae +#define MSR_P4_SAAT_ESCR1 0x000003af +#define MSR_P4_SSU_ESCR0 0x000003be +#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ + +#define MSR_P4_TBPU_ESCR0 0x000003c2 +#define MSR_P4_TBPU_ESCR1 0x000003c3 +#define MSR_P4_TC_ESCR0 0x000003c4 +#define MSR_P4_TC_ESCR1 0x000003c5 +#define MSR_P4_U2L_ESCR0 0x000003b0 +#define MSR_P4_U2L_ESCR1 0x000003b1 + +#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 + +/* Intel Core-based CPU performance counters */ +#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 +#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a +#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b +#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d +#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e +#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f +#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 + +/* Geode defined MSRs */ +#define MSR_GEODE_BUSCONT_CONF0 0x00001900 + +/* Intel VT MSRs */ +#define MSR_IA32_VMX_BASIC 0x00000480 +#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 +#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 +#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 +#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 +#define MSR_IA32_VMX_MISC 0x00000485 +#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 +#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 +#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 +#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 +#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a +#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b +#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c +#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d +#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e +#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f +#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 +#define MSR_IA32_VMX_VMFUNC 0x00000491 + +/* VMX_BASIC bits and bitmasks */ +#define VMX_BASIC_VMCS_SIZE_SHIFT 32 +#define VMX_BASIC_TRUE_CTLS (1ULL << 55) +#define VMX_BASIC_64 0x0001000000000000LLU +#define VMX_BASIC_MEM_TYPE_SHIFT 50 +#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU +#define VMX_BASIC_MEM_TYPE_WB 6LLU +#define VMX_BASIC_INOUT 0x0040000000000000LLU + +/* MSR_IA32_VMX_MISC bits */ +#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) +#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F +/* AMD-V MSRs */ + +#define MSR_VM_CR 0xc0010114 +#define MSR_VM_IGNNE 0xc0010115 +#define MSR_VM_HSAVE_PA 0xc0010117 + +#endif /* _UAPI_ASM_X86_MSR_INDEX_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/x86/include/asm/msr-index.h | 694 +-------------------------------- arch/x86/include/uapi/asm/msr-index.h | 698 ++++++++++++++++++++++++++++++++++ 2 files changed, 699 insertions(+), 693 deletions(-) create mode 100644 arch/x86/include/uapi/asm/msr-index.h diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 710273c617b8..1baa0628da74 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -1,698 +1,6 @@ #ifndef _ASM_X86_MSR_INDEX_H #define _ASM_X86_MSR_INDEX_H -/* - * CPU model specific register (MSR) numbers. - * - * Do not add new entries to this file unless the definitions are shared - * between multiple compilation units. - */ - -/* x86-64 specific MSRs */ -#define MSR_EFER 0xc0000080 /* extended feature register */ -#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ -#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ -#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ -#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ -#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ -#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ -#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ -#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ - -/* EFER bits: */ -#define _EFER_SCE 0 /* SYSCALL/SYSRET */ -#define _EFER_LME 8 /* Long mode enable */ -#define _EFER_LMA 10 /* Long mode active (read-only) */ -#define _EFER_NX 11 /* No execute enable */ -#define _EFER_SVME 12 /* Enable virtualization */ -#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ -#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ - -#define EFER_SCE (1<<_EFER_SCE) -#define EFER_LME (1<<_EFER_LME) -#define EFER_LMA (1<<_EFER_LMA) -#define EFER_NX (1<<_EFER_NX) -#define EFER_SVME (1<<_EFER_SVME) -#define EFER_LMSLE (1<<_EFER_LMSLE) -#define EFER_FFXSR (1<<_EFER_FFXSR) - -/* Intel MSRs. Some also available on other CPUs */ - -#define MSR_PPIN_CTL 0x0000004e -#define MSR_PPIN 0x0000004f - -#define MSR_IA32_PERFCTR0 0x000000c1 -#define MSR_IA32_PERFCTR1 0x000000c2 -#define MSR_FSB_FREQ 0x000000cd -#define MSR_PLATFORM_INFO 0x000000ce - -#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 -#define NHM_C3_AUTO_DEMOTE (1UL << 25) -#define NHM_C1_AUTO_DEMOTE (1UL << 26) -#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) -#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) -#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) - -#define MSR_MTRRcap 0x000000fe -#define MSR_IA32_BBL_CR_CTL 0x00000119 -#define MSR_IA32_BBL_CR_CTL3 0x0000011e - -#define MSR_IA32_SYSENTER_CS 0x00000174 -#define MSR_IA32_SYSENTER_ESP 0x00000175 -#define MSR_IA32_SYSENTER_EIP 0x00000176 - -#define MSR_IA32_MCG_CAP 0x00000179 -#define MSR_IA32_MCG_STATUS 0x0000017a -#define MSR_IA32_MCG_CTL 0x0000017b -#define MSR_IA32_MCG_EXT_CTL 0x000004d0 - -#define MSR_OFFCORE_RSP_0 0x000001a6 -#define MSR_OFFCORE_RSP_1 0x000001a7 -#define MSR_TURBO_RATIO_LIMIT 0x000001ad -#define MSR_TURBO_RATIO_LIMIT1 0x000001ae -#define MSR_TURBO_RATIO_LIMIT2 0x000001af - -#define MSR_LBR_SELECT 0x000001c8 -#define MSR_LBR_TOS 0x000001c9 -#define MSR_LBR_NHM_FROM 0x00000680 -#define MSR_LBR_NHM_TO 0x000006c0 -#define MSR_LBR_CORE_FROM 0x00000040 -#define MSR_LBR_CORE_TO 0x00000060 - -#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ -#define LBR_INFO_MISPRED BIT_ULL(63) -#define LBR_INFO_IN_TX BIT_ULL(62) -#define LBR_INFO_ABORT BIT_ULL(61) -#define LBR_INFO_CYCLES 0xffff - -#define MSR_IA32_PEBS_ENABLE 0x000003f1 -#define MSR_IA32_DS_AREA 0x00000600 -#define MSR_IA32_PERF_CAPABILITIES 0x00000345 -#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 - -#define MSR_IA32_RTIT_CTL 0x00000570 -#define MSR_IA32_RTIT_STATUS 0x00000571 -#define MSR_IA32_RTIT_ADDR0_A 0x00000580 -#define MSR_IA32_RTIT_ADDR0_B 0x00000581 -#define MSR_IA32_RTIT_ADDR1_A 0x00000582 -#define MSR_IA32_RTIT_ADDR1_B 0x00000583 -#define MSR_IA32_RTIT_ADDR2_A 0x00000584 -#define MSR_IA32_RTIT_ADDR2_B 0x00000585 -#define MSR_IA32_RTIT_ADDR3_A 0x00000586 -#define MSR_IA32_RTIT_ADDR3_B 0x00000587 -#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 -#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 -#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 - -#define MSR_MTRRfix64K_00000 0x00000250 -#define MSR_MTRRfix16K_80000 0x00000258 -#define MSR_MTRRfix16K_A0000 0x00000259 -#define MSR_MTRRfix4K_C0000 0x00000268 -#define MSR_MTRRfix4K_C8000 0x00000269 -#define MSR_MTRRfix4K_D0000 0x0000026a -#define MSR_MTRRfix4K_D8000 0x0000026b -#define MSR_MTRRfix4K_E0000 0x0000026c -#define MSR_MTRRfix4K_E8000 0x0000026d -#define MSR_MTRRfix4K_F0000 0x0000026e -#define MSR_MTRRfix4K_F8000 0x0000026f -#define MSR_MTRRdefType 0x000002ff - -#define MSR_IA32_CR_PAT 0x00000277 - -#define MSR_IA32_DEBUGCTLMSR 0x000001d9 -#define MSR_IA32_LASTBRANCHFROMIP 0x000001db -#define MSR_IA32_LASTBRANCHTOIP 0x000001dc -#define MSR_IA32_LASTINTFROMIP 0x000001dd -#define MSR_IA32_LASTINTTOIP 0x000001de - -/* DEBUGCTLMSR bits (others vary by model): */ -#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ -#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ -#define DEBUGCTLMSR_TR (1UL << 6) -#define DEBUGCTLMSR_BTS (1UL << 7) -#define DEBUGCTLMSR_BTINT (1UL << 8) -#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) -#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) -#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) - -#define MSR_PEBS_FRONTEND 0x000003f7 - -#define MSR_IA32_POWER_CTL 0x000001fc - -#define MSR_IA32_MC0_CTL 0x00000400 -#define MSR_IA32_MC0_STATUS 0x00000401 -#define MSR_IA32_MC0_ADDR 0x00000402 -#define MSR_IA32_MC0_MISC 0x00000403 - -/* C-state Residency Counters */ -#define MSR_PKG_C3_RESIDENCY 0x000003f8 -#define MSR_PKG_C6_RESIDENCY 0x000003f9 -#define MSR_PKG_C7_RESIDENCY 0x000003fa -#define MSR_CORE_C3_RESIDENCY 0x000003fc -#define MSR_CORE_C6_RESIDENCY 0x000003fd -#define MSR_CORE_C7_RESIDENCY 0x000003fe -#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff -#define MSR_PKG_C2_RESIDENCY 0x0000060d -#define MSR_PKG_C8_RESIDENCY 0x00000630 -#define MSR_PKG_C9_RESIDENCY 0x00000631 -#define MSR_PKG_C10_RESIDENCY 0x00000632 - -/* Interrupt Response Limit */ -#define MSR_PKGC3_IRTL 0x0000060a -#define MSR_PKGC6_IRTL 0x0000060b -#define MSR_PKGC7_IRTL 0x0000060c -#define MSR_PKGC8_IRTL 0x00000633 -#define MSR_PKGC9_IRTL 0x00000634 -#define MSR_PKGC10_IRTL 0x00000635 - -/* Run Time Average Power Limiting (RAPL) Interface */ - -#define MSR_RAPL_POWER_UNIT 0x00000606 - -#define MSR_PKG_POWER_LIMIT 0x00000610 -#define MSR_PKG_ENERGY_STATUS 0x00000611 -#define MSR_PKG_PERF_STATUS 0x00000613 -#define MSR_PKG_POWER_INFO 0x00000614 - -#define MSR_DRAM_POWER_LIMIT 0x00000618 -#define MSR_DRAM_ENERGY_STATUS 0x00000619 -#define MSR_DRAM_PERF_STATUS 0x0000061b -#define MSR_DRAM_POWER_INFO 0x0000061c - -#define MSR_PP0_POWER_LIMIT 0x00000638 -#define MSR_PP0_ENERGY_STATUS 0x00000639 -#define MSR_PP0_POLICY 0x0000063a -#define MSR_PP0_PERF_STATUS 0x0000063b - -#define MSR_PP1_POWER_LIMIT 0x00000640 -#define MSR_PP1_ENERGY_STATUS 0x00000641 -#define MSR_PP1_POLICY 0x00000642 - -/* Config TDP MSRs */ -#define MSR_CONFIG_TDP_NOMINAL 0x00000648 -#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 -#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A -#define MSR_CONFIG_TDP_CONTROL 0x0000064B -#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C - -#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D - -#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 -#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 -#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A -#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B - -#define MSR_CORE_C1_RES 0x00000660 - -#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 -#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 - -#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 -#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 -#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 - -/* Hardware P state interface */ -#define MSR_PPERF 0x0000064e -#define MSR_PERF_LIMIT_REASONS 0x0000064f -#define MSR_PM_ENABLE 0x00000770 -#define MSR_HWP_CAPABILITIES 0x00000771 -#define MSR_HWP_REQUEST_PKG 0x00000772 -#define MSR_HWP_INTERRUPT 0x00000773 -#define MSR_HWP_REQUEST 0x00000774 -#define MSR_HWP_STATUS 0x00000777 - -/* CPUID.6.EAX */ -#define HWP_BASE_BIT (1<<7) -#define HWP_NOTIFICATIONS_BIT (1<<8) -#define HWP_ACTIVITY_WINDOW_BIT (1<<9) -#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) -#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) - -/* IA32_HWP_CAPABILITIES */ -#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) -#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) -#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) -#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) - -/* IA32_HWP_REQUEST */ -#define HWP_MIN_PERF(x) (x & 0xff) -#define HWP_MAX_PERF(x) ((x & 0xff) << 8) -#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) -#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) -#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) -#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) - -/* IA32_HWP_STATUS */ -#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) - -/* IA32_HWP_INTERRUPT */ -#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) - -#define MSR_AMD64_MC0_MASK 0xc0010044 - -#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) -#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) -#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) -#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) - -#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) - -/* These are consecutive and not in the normal 4er MCE bank block */ -#define MSR_IA32_MC0_CTL2 0x00000280 -#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) - -#define MSR_P6_PERFCTR0 0x000000c1 -#define MSR_P6_PERFCTR1 0x000000c2 -#define MSR_P6_EVNTSEL0 0x00000186 -#define MSR_P6_EVNTSEL1 0x00000187 - -#define MSR_KNC_PERFCTR0 0x00000020 -#define MSR_KNC_PERFCTR1 0x00000021 -#define MSR_KNC_EVNTSEL0 0x00000028 -#define MSR_KNC_EVNTSEL1 0x00000029 - -/* Alternative perfctr range with full access. */ -#define MSR_IA32_PMC0 0x000004c1 - -/* AMD64 MSRs. Not complete. See the architecture manual for a more - complete list. */ - -#define MSR_AMD64_PATCH_LEVEL 0x0000008b -#define MSR_AMD64_TSC_RATIO 0xc0000104 -#define MSR_AMD64_NB_CFG 0xc001001f -#define MSR_AMD64_PATCH_LOADER 0xc0010020 -#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 -#define MSR_AMD64_OSVW_STATUS 0xc0010141 -#define MSR_AMD64_LS_CFG 0xc0011020 -#define MSR_AMD64_DC_CFG 0xc0011022 -#define MSR_AMD64_BU_CFG2 0xc001102a -#define MSR_AMD64_IBSFETCHCTL 0xc0011030 -#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 -#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 -#define MSR_AMD64_IBSFETCH_REG_COUNT 3 -#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) -#define MSR_AMD64_IBSOPCTL 0xc0011033 -#define MSR_AMD64_IBSOPRIP 0xc0011034 -#define MSR_AMD64_IBSOPDATA 0xc0011035 -#define MSR_AMD64_IBSOPDATA2 0xc0011036 -#define MSR_AMD64_IBSOPDATA3 0xc0011037 -#define MSR_AMD64_IBSDCLINAD 0xc0011038 -#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 -#define MSR_AMD64_IBSOP_REG_COUNT 7 -#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) -#define MSR_AMD64_IBSCTL 0xc001103a -#define MSR_AMD64_IBSBRTARGET 0xc001103b -#define MSR_AMD64_IBSOPDATA4 0xc001103d -#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ - -/* Fam 17h MSRs */ -#define MSR_F17H_IRPERF 0xc00000e9 - -/* Fam 16h MSRs */ -#define MSR_F16H_L2I_PERF_CTL 0xc0010230 -#define MSR_F16H_L2I_PERF_CTR 0xc0010231 -#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 -#define MSR_F16H_DR2_ADDR_MASK 0xc001101a -#define MSR_F16H_DR3_ADDR_MASK 0xc001101b -#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 - -/* Fam 15h MSRs */ -#define MSR_F15H_PERF_CTL 0xc0010200 -#define MSR_F15H_PERF_CTR 0xc0010201 -#define MSR_F15H_NB_PERF_CTL 0xc0010240 -#define MSR_F15H_NB_PERF_CTR 0xc0010241 -#define MSR_F15H_PTSC 0xc0010280 -#define MSR_F15H_IC_CFG 0xc0011021 - -/* Fam 10h MSRs */ -#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 -#define FAM10H_MMIO_CONF_ENABLE (1<<0) -#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf -#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 -#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL -#define FAM10H_MMIO_CONF_BASE_SHIFT 20 -#define MSR_FAM10H_NODE_ID 0xc001100c - -/* K8 MSRs */ -#define MSR_K8_TOP_MEM1 0xc001001a -#define MSR_K8_TOP_MEM2 0xc001001d -#define MSR_K8_SYSCFG 0xc0010010 -#define MSR_K8_INT_PENDING_MSG 0xc0010055 -/* C1E active bits in int pending message */ -#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 -#define MSR_K8_TSEG_ADDR 0xc0010112 -#define MSR_K8_TSEG_MASK 0xc0010113 -#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ -#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ -#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ - -/* K7 MSRs */ -#define MSR_K7_EVNTSEL0 0xc0010000 -#define MSR_K7_PERFCTR0 0xc0010004 -#define MSR_K7_EVNTSEL1 0xc0010001 -#define MSR_K7_PERFCTR1 0xc0010005 -#define MSR_K7_EVNTSEL2 0xc0010002 -#define MSR_K7_PERFCTR2 0xc0010006 -#define MSR_K7_EVNTSEL3 0xc0010003 -#define MSR_K7_PERFCTR3 0xc0010007 -#define MSR_K7_CLK_CTL 0xc001001b -#define MSR_K7_HWCR 0xc0010015 -#define MSR_K7_FID_VID_CTL 0xc0010041 -#define MSR_K7_FID_VID_STATUS 0xc0010042 - -/* K6 MSRs */ -#define MSR_K6_WHCR 0xc0000082 -#define MSR_K6_UWCCR 0xc0000085 -#define MSR_K6_EPMR 0xc0000086 -#define MSR_K6_PSOR 0xc0000087 -#define MSR_K6_PFIR 0xc0000088 - -/* Centaur-Hauls/IDT defined MSRs. */ -#define MSR_IDT_FCR1 0x00000107 -#define MSR_IDT_FCR2 0x00000108 -#define MSR_IDT_FCR3 0x00000109 -#define MSR_IDT_FCR4 0x0000010a - -#define MSR_IDT_MCR0 0x00000110 -#define MSR_IDT_MCR1 0x00000111 -#define MSR_IDT_MCR2 0x00000112 -#define MSR_IDT_MCR3 0x00000113 -#define MSR_IDT_MCR4 0x00000114 -#define MSR_IDT_MCR5 0x00000115 -#define MSR_IDT_MCR6 0x00000116 -#define MSR_IDT_MCR7 0x00000117 -#define MSR_IDT_MCR_CTRL 0x00000120 - -/* VIA Cyrix defined MSRs*/ -#define MSR_VIA_FCR 0x00001107 -#define MSR_VIA_LONGHAUL 0x0000110a -#define MSR_VIA_RNG 0x0000110b -#define MSR_VIA_BCR2 0x00001147 - -/* Transmeta defined MSRs */ -#define MSR_TMTA_LONGRUN_CTRL 0x80868010 -#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 -#define MSR_TMTA_LRTI_READOUT 0x80868018 -#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a - -/* Intel defined MSRs. */ -#define MSR_IA32_P5_MC_ADDR 0x00000000 -#define MSR_IA32_P5_MC_TYPE 0x00000001 -#define MSR_IA32_TSC 0x00000010 -#define MSR_IA32_PLATFORM_ID 0x00000017 -#define MSR_IA32_EBL_CR_POWERON 0x0000002a -#define MSR_EBC_FREQUENCY_ID 0x0000002c -#define MSR_SMI_COUNT 0x00000034 -#define MSR_IA32_FEATURE_CONTROL 0x0000003a -#define MSR_IA32_TSC_ADJUST 0x0000003b -#define MSR_IA32_BNDCFGS 0x00000d90 - -#define MSR_IA32_XSS 0x00000da0 - -#define FEATURE_CONTROL_LOCKED (1<<0) -#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) -#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) -#define FEATURE_CONTROL_LMCE (1<<20) - -#define MSR_IA32_APICBASE 0x0000001b -#define MSR_IA32_APICBASE_BSP (1<<8) -#define MSR_IA32_APICBASE_ENABLE (1<<11) -#define MSR_IA32_APICBASE_BASE (0xfffff<<12) - -#define MSR_IA32_TSCDEADLINE 0x000006e0 - -#define MSR_IA32_UCODE_WRITE 0x00000079 -#define MSR_IA32_UCODE_REV 0x0000008b - -#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b -#define MSR_IA32_SMBASE 0x0000009e - -#define MSR_IA32_PERF_STATUS 0x00000198 -#define MSR_IA32_PERF_CTL 0x00000199 -#define INTEL_PERF_CTL_MASK 0xffff -#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 -#define MSR_AMD_PERF_STATUS 0xc0010063 -#define MSR_AMD_PERF_CTL 0xc0010062 - -#define MSR_IA32_MPERF 0x000000e7 -#define MSR_IA32_APERF 0x000000e8 - -#define MSR_IA32_THERM_CONTROL 0x0000019a -#define MSR_IA32_THERM_INTERRUPT 0x0000019b - -#define THERM_INT_HIGH_ENABLE (1 << 0) -#define THERM_INT_LOW_ENABLE (1 << 1) -#define THERM_INT_PLN_ENABLE (1 << 24) - -#define MSR_IA32_THERM_STATUS 0x0000019c - -#define THERM_STATUS_PROCHOT (1 << 0) -#define THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_THERM2_CTL 0x0000019d - -#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) - -#define MSR_IA32_MISC_ENABLE 0x000001a0 - -#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 - -#define MSR_MISC_PWR_MGMT 0x000001aa - -#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 -#define ENERGY_PERF_BIAS_PERFORMANCE 0 -#define ENERGY_PERF_BIAS_NORMAL 6 -#define ENERGY_PERF_BIAS_POWERSAVE 15 - -#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 - -#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) -#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 - -#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) -#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) -#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) - -/* Thermal Thresholds Support */ -#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) -#define THERM_SHIFT_THRESHOLD0 8 -#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) -#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) -#define THERM_SHIFT_THRESHOLD1 16 -#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) -#define THERM_STATUS_THRESHOLD0 (1 << 6) -#define THERM_LOG_THRESHOLD0 (1 << 7) -#define THERM_STATUS_THRESHOLD1 (1 << 8) -#define THERM_LOG_THRESHOLD1 (1 << 9) - -/* MISC_ENABLE bits: architectural */ -#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 -#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) -#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 -#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) -#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 -#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) -#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 -#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 -#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) - -/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ -#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 -#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) -#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 -#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) -#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 -#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) - -#define MSR_IA32_TSC_DEADLINE 0x000006E0 - -/* P4/Xeon+ specific */ -#define MSR_IA32_MCG_EAX 0x00000180 -#define MSR_IA32_MCG_EBX 0x00000181 -#define MSR_IA32_MCG_ECX 0x00000182 -#define MSR_IA32_MCG_EDX 0x00000183 -#define MSR_IA32_MCG_ESI 0x00000184 -#define MSR_IA32_MCG_EDI 0x00000185 -#define MSR_IA32_MCG_EBP 0x00000186 -#define MSR_IA32_MCG_ESP 0x00000187 -#define MSR_IA32_MCG_EFLAGS 0x00000188 -#define MSR_IA32_MCG_EIP 0x00000189 -#define MSR_IA32_MCG_RESERVED 0x0000018a - -/* Pentium IV performance counter MSRs */ -#define MSR_P4_BPU_PERFCTR0 0x00000300 -#define MSR_P4_BPU_PERFCTR1 0x00000301 -#define MSR_P4_BPU_PERFCTR2 0x00000302 -#define MSR_P4_BPU_PERFCTR3 0x00000303 -#define MSR_P4_MS_PERFCTR0 0x00000304 -#define MSR_P4_MS_PERFCTR1 0x00000305 -#define MSR_P4_MS_PERFCTR2 0x00000306 -#define MSR_P4_MS_PERFCTR3 0x00000307 -#define MSR_P4_FLAME_PERFCTR0 0x00000308 -#define MSR_P4_FLAME_PERFCTR1 0x00000309 -#define MSR_P4_FLAME_PERFCTR2 0x0000030a -#define MSR_P4_FLAME_PERFCTR3 0x0000030b -#define MSR_P4_IQ_PERFCTR0 0x0000030c -#define MSR_P4_IQ_PERFCTR1 0x0000030d -#define MSR_P4_IQ_PERFCTR2 0x0000030e -#define MSR_P4_IQ_PERFCTR3 0x0000030f -#define MSR_P4_IQ_PERFCTR4 0x00000310 -#define MSR_P4_IQ_PERFCTR5 0x00000311 -#define MSR_P4_BPU_CCCR0 0x00000360 -#define MSR_P4_BPU_CCCR1 0x00000361 -#define MSR_P4_BPU_CCCR2 0x00000362 -#define MSR_P4_BPU_CCCR3 0x00000363 -#define MSR_P4_MS_CCCR0 0x00000364 -#define MSR_P4_MS_CCCR1 0x00000365 -#define MSR_P4_MS_CCCR2 0x00000366 -#define MSR_P4_MS_CCCR3 0x00000367 -#define MSR_P4_FLAME_CCCR0 0x00000368 -#define MSR_P4_FLAME_CCCR1 0x00000369 -#define MSR_P4_FLAME_CCCR2 0x0000036a -#define MSR_P4_FLAME_CCCR3 0x0000036b -#define MSR_P4_IQ_CCCR0 0x0000036c -#define MSR_P4_IQ_CCCR1 0x0000036d -#define MSR_P4_IQ_CCCR2 0x0000036e -#define MSR_P4_IQ_CCCR3 0x0000036f -#define MSR_P4_IQ_CCCR4 0x00000370 -#define MSR_P4_IQ_CCCR5 0x00000371 -#define MSR_P4_ALF_ESCR0 0x000003ca -#define MSR_P4_ALF_ESCR1 0x000003cb -#define MSR_P4_BPU_ESCR0 0x000003b2 -#define MSR_P4_BPU_ESCR1 0x000003b3 -#define MSR_P4_BSU_ESCR0 0x000003a0 -#define MSR_P4_BSU_ESCR1 0x000003a1 -#define MSR_P4_CRU_ESCR0 0x000003b8 -#define MSR_P4_CRU_ESCR1 0x000003b9 -#define MSR_P4_CRU_ESCR2 0x000003cc -#define MSR_P4_CRU_ESCR3 0x000003cd -#define MSR_P4_CRU_ESCR4 0x000003e0 -#define MSR_P4_CRU_ESCR5 0x000003e1 -#define MSR_P4_DAC_ESCR0 0x000003a8 -#define MSR_P4_DAC_ESCR1 0x000003a9 -#define MSR_P4_FIRM_ESCR0 0x000003a4 -#define MSR_P4_FIRM_ESCR1 0x000003a5 -#define MSR_P4_FLAME_ESCR0 0x000003a6 -#define MSR_P4_FLAME_ESCR1 0x000003a7 -#define MSR_P4_FSB_ESCR0 0x000003a2 -#define MSR_P4_FSB_ESCR1 0x000003a3 -#define MSR_P4_IQ_ESCR0 0x000003ba -#define MSR_P4_IQ_ESCR1 0x000003bb -#define MSR_P4_IS_ESCR0 0x000003b4 -#define MSR_P4_IS_ESCR1 0x000003b5 -#define MSR_P4_ITLB_ESCR0 0x000003b6 -#define MSR_P4_ITLB_ESCR1 0x000003b7 -#define MSR_P4_IX_ESCR0 0x000003c8 -#define MSR_P4_IX_ESCR1 0x000003c9 -#define MSR_P4_MOB_ESCR0 0x000003aa -#define MSR_P4_MOB_ESCR1 0x000003ab -#define MSR_P4_MS_ESCR0 0x000003c0 -#define MSR_P4_MS_ESCR1 0x000003c1 -#define MSR_P4_PMH_ESCR0 0x000003ac -#define MSR_P4_PMH_ESCR1 0x000003ad -#define MSR_P4_RAT_ESCR0 0x000003bc -#define MSR_P4_RAT_ESCR1 0x000003bd -#define MSR_P4_SAAT_ESCR0 0x000003ae -#define MSR_P4_SAAT_ESCR1 0x000003af -#define MSR_P4_SSU_ESCR0 0x000003be -#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ - -#define MSR_P4_TBPU_ESCR0 0x000003c2 -#define MSR_P4_TBPU_ESCR1 0x000003c3 -#define MSR_P4_TC_ESCR0 0x000003c4 -#define MSR_P4_TC_ESCR1 0x000003c5 -#define MSR_P4_U2L_ESCR0 0x000003b0 -#define MSR_P4_U2L_ESCR1 0x000003b1 - -#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 - -/* Intel Core-based CPU performance counters */ -#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 -#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a -#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b -#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d -#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e -#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f -#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 - -/* Geode defined MSRs */ -#define MSR_GEODE_BUSCONT_CONF0 0x00001900 - -/* Intel VT MSRs */ -#define MSR_IA32_VMX_BASIC 0x00000480 -#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 -#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 -#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 -#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 -#define MSR_IA32_VMX_MISC 0x00000485 -#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 -#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 -#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 -#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 -#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a -#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b -#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c -#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d -#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e -#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f -#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 -#define MSR_IA32_VMX_VMFUNC 0x00000491 - -/* VMX_BASIC bits and bitmasks */ -#define VMX_BASIC_VMCS_SIZE_SHIFT 32 -#define VMX_BASIC_TRUE_CTLS (1ULL << 55) -#define VMX_BASIC_64 0x0001000000000000LLU -#define VMX_BASIC_MEM_TYPE_SHIFT 50 -#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU -#define VMX_BASIC_MEM_TYPE_WB 6LLU -#define VMX_BASIC_INOUT 0x0040000000000000LLU - -/* MSR_IA32_VMX_MISC bits */ -#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) -#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F -/* AMD-V MSRs */ - -#define MSR_VM_CR 0xc0010114 -#define MSR_VM_IGNNE 0xc0010115 -#define MSR_VM_HSAVE_PA 0xc0010117 +#include <uapi/asm/msr-index.h> #endif /* _ASM_X86_MSR_INDEX_H */ diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h new file mode 100644 index 000000000000..d097e832ee3c --- /dev/null +++ b/arch/x86/include/uapi/asm/msr-index.h @@ -0,0 +1,698 @@ +#ifndef _UAPI_ASM_X86_MSR_INDEX_H +#define _UAPI_ASM_X86_MSR_INDEX_H + +/* + * CPU model specific register (MSR) numbers. + * + * Do not add new entries to this file unless the definitions are shared + * between multiple compilation units. + */ + +/* x86-64 specific MSRs */ +#define MSR_EFER 0xc0000080 /* extended feature register */ +#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ +#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ +#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ +#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ +#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ +#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ +#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ +#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ + +/* EFER bits: */ +#define _EFER_SCE 0 /* SYSCALL/SYSRET */ +#define _EFER_LME 8 /* Long mode enable */ +#define _EFER_LMA 10 /* Long mode active (read-only) */ +#define _EFER_NX 11 /* No execute enable */ +#define _EFER_SVME 12 /* Enable virtualization */ +#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ +#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ + +#define EFER_SCE (1<<_EFER_SCE) +#define EFER_LME (1<<_EFER_LME) +#define EFER_LMA (1<<_EFER_LMA) +#define EFER_NX (1<<_EFER_NX) +#define EFER_SVME (1<<_EFER_SVME) +#define EFER_LMSLE (1<<_EFER_LMSLE) +#define EFER_FFXSR (1<<_EFER_FFXSR) + +/* Intel MSRs. Some also available on other CPUs */ + +#define MSR_PPIN_CTL 0x0000004e +#define MSR_PPIN 0x0000004f + +#define MSR_IA32_PERFCTR0 0x000000c1 +#define MSR_IA32_PERFCTR1 0x000000c2 +#define MSR_FSB_FREQ 0x000000cd +#define MSR_PLATFORM_INFO 0x000000ce + +#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 +#define NHM_C3_AUTO_DEMOTE (1UL << 25) +#define NHM_C1_AUTO_DEMOTE (1UL << 26) +#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) +#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) +#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) + +#define MSR_MTRRcap 0x000000fe +#define MSR_IA32_BBL_CR_CTL 0x00000119 +#define MSR_IA32_BBL_CR_CTL3 0x0000011e + +#define MSR_IA32_SYSENTER_CS 0x00000174 +#define MSR_IA32_SYSENTER_ESP 0x00000175 +#define MSR_IA32_SYSENTER_EIP 0x00000176 + +#define MSR_IA32_MCG_CAP 0x00000179 +#define MSR_IA32_MCG_STATUS 0x0000017a +#define MSR_IA32_MCG_CTL 0x0000017b +#define MSR_IA32_MCG_EXT_CTL 0x000004d0 + +#define MSR_OFFCORE_RSP_0 0x000001a6 +#define MSR_OFFCORE_RSP_1 0x000001a7 +#define MSR_TURBO_RATIO_LIMIT 0x000001ad +#define MSR_TURBO_RATIO_LIMIT1 0x000001ae +#define MSR_TURBO_RATIO_LIMIT2 0x000001af + +#define MSR_LBR_SELECT 0x000001c8 +#define MSR_LBR_TOS 0x000001c9 +#define MSR_LBR_NHM_FROM 0x00000680 +#define MSR_LBR_NHM_TO 0x000006c0 +#define MSR_LBR_CORE_FROM 0x00000040 +#define MSR_LBR_CORE_TO 0x00000060 + +#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ +#define LBR_INFO_MISPRED BIT_ULL(63) +#define LBR_INFO_IN_TX BIT_ULL(62) +#define LBR_INFO_ABORT BIT_ULL(61) +#define LBR_INFO_CYCLES 0xffff + +#define MSR_IA32_PEBS_ENABLE 0x000003f1 +#define MSR_IA32_DS_AREA 0x00000600 +#define MSR_IA32_PERF_CAPABILITIES 0x00000345 +#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 + +#define MSR_IA32_RTIT_CTL 0x00000570 +#define MSR_IA32_RTIT_STATUS 0x00000571 +#define MSR_IA32_RTIT_ADDR0_A 0x00000580 +#define MSR_IA32_RTIT_ADDR0_B 0x00000581 +#define MSR_IA32_RTIT_ADDR1_A 0x00000582 +#define MSR_IA32_RTIT_ADDR1_B 0x00000583 +#define MSR_IA32_RTIT_ADDR2_A 0x00000584 +#define MSR_IA32_RTIT_ADDR2_B 0x00000585 +#define MSR_IA32_RTIT_ADDR3_A 0x00000586 +#define MSR_IA32_RTIT_ADDR3_B 0x00000587 +#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 +#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 +#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 + +#define MSR_MTRRfix64K_00000 0x00000250 +#define MSR_MTRRfix16K_80000 0x00000258 +#define MSR_MTRRfix16K_A0000 0x00000259 +#define MSR_MTRRfix4K_C0000 0x00000268 +#define MSR_MTRRfix4K_C8000 0x00000269 +#define MSR_MTRRfix4K_D0000 0x0000026a +#define MSR_MTRRfix4K_D8000 0x0000026b +#define MSR_MTRRfix4K_E0000 0x0000026c +#define MSR_MTRRfix4K_E8000 0x0000026d +#define MSR_MTRRfix4K_F0000 0x0000026e +#define MSR_MTRRfix4K_F8000 0x0000026f +#define MSR_MTRRdefType 0x000002ff + +#define MSR_IA32_CR_PAT 0x00000277 + +#define MSR_IA32_DEBUGCTLMSR 0x000001d9 +#define MSR_IA32_LASTBRANCHFROMIP 0x000001db +#define MSR_IA32_LASTBRANCHTOIP 0x000001dc +#define MSR_IA32_LASTINTFROMIP 0x000001dd +#define MSR_IA32_LASTINTTOIP 0x000001de + +/* DEBUGCTLMSR bits (others vary by model): */ +#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ +#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ +#define DEBUGCTLMSR_TR (1UL << 6) +#define DEBUGCTLMSR_BTS (1UL << 7) +#define DEBUGCTLMSR_BTINT (1UL << 8) +#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) +#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) +#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) + +#define MSR_PEBS_FRONTEND 0x000003f7 + +#define MSR_IA32_POWER_CTL 0x000001fc + +#define MSR_IA32_MC0_CTL 0x00000400 +#define MSR_IA32_MC0_STATUS 0x00000401 +#define MSR_IA32_MC0_ADDR 0x00000402 +#define MSR_IA32_MC0_MISC 0x00000403 + +/* C-state Residency Counters */ +#define MSR_PKG_C3_RESIDENCY 0x000003f8 +#define MSR_PKG_C6_RESIDENCY 0x000003f9 +#define MSR_PKG_C7_RESIDENCY 0x000003fa +#define MSR_CORE_C3_RESIDENCY 0x000003fc +#define MSR_CORE_C6_RESIDENCY 0x000003fd +#define MSR_CORE_C7_RESIDENCY 0x000003fe +#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff +#define MSR_PKG_C2_RESIDENCY 0x0000060d +#define MSR_PKG_C8_RESIDENCY 0x00000630 +#define MSR_PKG_C9_RESIDENCY 0x00000631 +#define MSR_PKG_C10_RESIDENCY 0x00000632 + +/* Interrupt Response Limit */ +#define MSR_PKGC3_IRTL 0x0000060a +#define MSR_PKGC6_IRTL 0x0000060b +#define MSR_PKGC7_IRTL 0x0000060c +#define MSR_PKGC8_IRTL 0x00000633 +#define MSR_PKGC9_IRTL 0x00000634 +#define MSR_PKGC10_IRTL 0x00000635 + +/* Run Time Average Power Limiting (RAPL) Interface */ + +#define MSR_RAPL_POWER_UNIT 0x00000606 + +#define MSR_PKG_POWER_LIMIT 0x00000610 +#define MSR_PKG_ENERGY_STATUS 0x00000611 +#define MSR_PKG_PERF_STATUS 0x00000613 +#define MSR_PKG_POWER_INFO 0x00000614 + +#define MSR_DRAM_POWER_LIMIT 0x00000618 +#define MSR_DRAM_ENERGY_STATUS 0x00000619 +#define MSR_DRAM_PERF_STATUS 0x0000061b +#define MSR_DRAM_POWER_INFO 0x0000061c + +#define MSR_PP0_POWER_LIMIT 0x00000638 +#define MSR_PP0_ENERGY_STATUS 0x00000639 +#define MSR_PP0_POLICY 0x0000063a +#define MSR_PP0_PERF_STATUS 0x0000063b + +#define MSR_PP1_POWER_LIMIT 0x00000640 +#define MSR_PP1_ENERGY_STATUS 0x00000641 +#define MSR_PP1_POLICY 0x00000642 + +/* Config TDP MSRs */ +#define MSR_CONFIG_TDP_NOMINAL 0x00000648 +#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 +#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A +#define MSR_CONFIG_TDP_CONTROL 0x0000064B +#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C + +#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D + +#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 +#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 +#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A +#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B + +#define MSR_CORE_C1_RES 0x00000660 + +#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 +#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 + +#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 +#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 +#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 + +/* Hardware P state interface */ +#define MSR_PPERF 0x0000064e +#define MSR_PERF_LIMIT_REASONS 0x0000064f +#define MSR_PM_ENABLE 0x00000770 +#define MSR_HWP_CAPABILITIES 0x00000771 +#define MSR_HWP_REQUEST_PKG 0x00000772 +#define MSR_HWP_INTERRUPT 0x00000773 +#define MSR_HWP_REQUEST 0x00000774 +#define MSR_HWP_STATUS 0x00000777 + +/* CPUID.6.EAX */ +#define HWP_BASE_BIT (1<<7) +#define HWP_NOTIFICATIONS_BIT (1<<8) +#define HWP_ACTIVITY_WINDOW_BIT (1<<9) +#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) +#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) + +/* IA32_HWP_CAPABILITIES */ +#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) +#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) +#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) +#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) + +/* IA32_HWP_REQUEST */ +#define HWP_MIN_PERF(x) (x & 0xff) +#define HWP_MAX_PERF(x) ((x & 0xff) << 8) +#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) +#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) +#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) +#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) + +/* IA32_HWP_STATUS */ +#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) + +/* IA32_HWP_INTERRUPT */ +#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) + +#define MSR_AMD64_MC0_MASK 0xc0010044 + +#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) +#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) +#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) +#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) + +#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) + +/* These are consecutive and not in the normal 4er MCE bank block */ +#define MSR_IA32_MC0_CTL2 0x00000280 +#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) + +#define MSR_P6_PERFCTR0 0x000000c1 +#define MSR_P6_PERFCTR1 0x000000c2 +#define MSR_P6_EVNTSEL0 0x00000186 +#define MSR_P6_EVNTSEL1 0x00000187 + +#define MSR_KNC_PERFCTR0 0x00000020 +#define MSR_KNC_PERFCTR1 0x00000021 +#define MSR_KNC_EVNTSEL0 0x00000028 +#define MSR_KNC_EVNTSEL1 0x00000029 + +/* Alternative perfctr range with full access. */ +#define MSR_IA32_PMC0 0x000004c1 + +/* AMD64 MSRs. Not complete. See the architecture manual for a more + complete list. */ + +#define MSR_AMD64_PATCH_LEVEL 0x0000008b +#define MSR_AMD64_TSC_RATIO 0xc0000104 +#define MSR_AMD64_NB_CFG 0xc001001f +#define MSR_AMD64_PATCH_LOADER 0xc0010020 +#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 +#define MSR_AMD64_OSVW_STATUS 0xc0010141 +#define MSR_AMD64_LS_CFG 0xc0011020 +#define MSR_AMD64_DC_CFG 0xc0011022 +#define MSR_AMD64_BU_CFG2 0xc001102a +#define MSR_AMD64_IBSFETCHCTL 0xc0011030 +#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 +#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 +#define MSR_AMD64_IBSFETCH_REG_COUNT 3 +#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) +#define MSR_AMD64_IBSOPCTL 0xc0011033 +#define MSR_AMD64_IBSOPRIP 0xc0011034 +#define MSR_AMD64_IBSOPDATA 0xc0011035 +#define MSR_AMD64_IBSOPDATA2 0xc0011036 +#define MSR_AMD64_IBSOPDATA3 0xc0011037 +#define MSR_AMD64_IBSDCLINAD 0xc0011038 +#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 +#define MSR_AMD64_IBSOP_REG_COUNT 7 +#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) +#define MSR_AMD64_IBSCTL 0xc001103a +#define MSR_AMD64_IBSBRTARGET 0xc001103b +#define MSR_AMD64_IBSOPDATA4 0xc001103d +#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ + +/* Fam 17h MSRs */ +#define MSR_F17H_IRPERF 0xc00000e9 + +/* Fam 16h MSRs */ +#define MSR_F16H_L2I_PERF_CTL 0xc0010230 +#define MSR_F16H_L2I_PERF_CTR 0xc0010231 +#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 +#define MSR_F16H_DR2_ADDR_MASK 0xc001101a +#define MSR_F16H_DR3_ADDR_MASK 0xc001101b +#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 + +/* Fam 15h MSRs */ +#define MSR_F15H_PERF_CTL 0xc0010200 +#define MSR_F15H_PERF_CTR 0xc0010201 +#define MSR_F15H_NB_PERF_CTL 0xc0010240 +#define MSR_F15H_NB_PERF_CTR 0xc0010241 +#define MSR_F15H_PTSC 0xc0010280 +#define MSR_F15H_IC_CFG 0xc0011021 + +/* Fam 10h MSRs */ +#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 +#define FAM10H_MMIO_CONF_ENABLE (1<<0) +#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf +#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 +#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL +#define FAM10H_MMIO_CONF_BASE_SHIFT 20 +#define MSR_FAM10H_NODE_ID 0xc001100c + +/* K8 MSRs */ +#define MSR_K8_TOP_MEM1 0xc001001a +#define MSR_K8_TOP_MEM2 0xc001001d +#define MSR_K8_SYSCFG 0xc0010010 +#define MSR_K8_INT_PENDING_MSG 0xc0010055 +/* C1E active bits in int pending message */ +#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 +#define MSR_K8_TSEG_ADDR 0xc0010112 +#define MSR_K8_TSEG_MASK 0xc0010113 +#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ +#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ +#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ + +/* K7 MSRs */ +#define MSR_K7_EVNTSEL0 0xc0010000 +#define MSR_K7_PERFCTR0 0xc0010004 +#define MSR_K7_EVNTSEL1 0xc0010001 +#define MSR_K7_PERFCTR1 0xc0010005 +#define MSR_K7_EVNTSEL2 0xc0010002 +#define MSR_K7_PERFCTR2 0xc0010006 +#define MSR_K7_EVNTSEL3 0xc0010003 +#define MSR_K7_PERFCTR3 0xc0010007 +#define MSR_K7_CLK_CTL 0xc001001b +#define MSR_K7_HWCR 0xc0010015 +#define MSR_K7_FID_VID_CTL 0xc0010041 +#define MSR_K7_FID_VID_STATUS 0xc0010042 + +/* K6 MSRs */ +#define MSR_K6_WHCR 0xc0000082 +#define MSR_K6_UWCCR 0xc0000085 +#define MSR_K6_EPMR 0xc0000086 +#define MSR_K6_PSOR 0xc0000087 +#define MSR_K6_PFIR 0xc0000088 + +/* Centaur-Hauls/IDT defined MSRs. */ +#define MSR_IDT_FCR1 0x00000107 +#define MSR_IDT_FCR2 0x00000108 +#define MSR_IDT_FCR3 0x00000109 +#define MSR_IDT_FCR4 0x0000010a + +#define MSR_IDT_MCR0 0x00000110 +#define MSR_IDT_MCR1 0x00000111 +#define MSR_IDT_MCR2 0x00000112 +#define MSR_IDT_MCR3 0x00000113 +#define MSR_IDT_MCR4 0x00000114 +#define MSR_IDT_MCR5 0x00000115 +#define MSR_IDT_MCR6 0x00000116 +#define MSR_IDT_MCR7 0x00000117 +#define MSR_IDT_MCR_CTRL 0x00000120 + +/* VIA Cyrix defined MSRs*/ +#define MSR_VIA_FCR 0x00001107 +#define MSR_VIA_LONGHAUL 0x0000110a +#define MSR_VIA_RNG 0x0000110b +#define MSR_VIA_BCR2 0x00001147 + +/* Transmeta defined MSRs */ +#define MSR_TMTA_LONGRUN_CTRL 0x80868010 +#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 +#define MSR_TMTA_LRTI_READOUT 0x80868018 +#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a + +/* Intel defined MSRs. */ +#define MSR_IA32_P5_MC_ADDR 0x00000000 +#define MSR_IA32_P5_MC_TYPE 0x00000001 +#define MSR_IA32_TSC 0x00000010 +#define MSR_IA32_PLATFORM_ID 0x00000017 +#define MSR_IA32_EBL_CR_POWERON 0x0000002a +#define MSR_EBC_FREQUENCY_ID 0x0000002c +#define MSR_SMI_COUNT 0x00000034 +#define MSR_IA32_FEATURE_CONTROL 0x0000003a +#define MSR_IA32_TSC_ADJUST 0x0000003b +#define MSR_IA32_BNDCFGS 0x00000d90 + +#define MSR_IA32_XSS 0x00000da0 + +#define FEATURE_CONTROL_LOCKED (1<<0) +#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) +#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) +#define FEATURE_CONTROL_LMCE (1<<20) + +#define MSR_IA32_APICBASE 0x0000001b +#define MSR_IA32_APICBASE_BSP (1<<8) +#define MSR_IA32_APICBASE_ENABLE (1<<11) +#define MSR_IA32_APICBASE_BASE (0xfffff<<12) + +#define MSR_IA32_TSCDEADLINE 0x000006e0 + +#define MSR_IA32_UCODE_WRITE 0x00000079 +#define MSR_IA32_UCODE_REV 0x0000008b + +#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b +#define MSR_IA32_SMBASE 0x0000009e + +#define MSR_IA32_PERF_STATUS 0x00000198 +#define MSR_IA32_PERF_CTL 0x00000199 +#define INTEL_PERF_CTL_MASK 0xffff +#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 +#define MSR_AMD_PERF_STATUS 0xc0010063 +#define MSR_AMD_PERF_CTL 0xc0010062 + +#define MSR_IA32_MPERF 0x000000e7 +#define MSR_IA32_APERF 0x000000e8 + +#define MSR_IA32_THERM_CONTROL 0x0000019a +#define MSR_IA32_THERM_INTERRUPT 0x0000019b + +#define THERM_INT_HIGH_ENABLE (1 << 0) +#define THERM_INT_LOW_ENABLE (1 << 1) +#define THERM_INT_PLN_ENABLE (1 << 24) + +#define MSR_IA32_THERM_STATUS 0x0000019c + +#define THERM_STATUS_PROCHOT (1 << 0) +#define THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_THERM2_CTL 0x0000019d + +#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) + +#define MSR_IA32_MISC_ENABLE 0x000001a0 + +#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 + +#define MSR_MISC_PWR_MGMT 0x000001aa + +#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 +#define ENERGY_PERF_BIAS_PERFORMANCE 0 +#define ENERGY_PERF_BIAS_NORMAL 6 +#define ENERGY_PERF_BIAS_POWERSAVE 15 + +#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 + +#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) +#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 + +#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) +#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) +#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) + +/* Thermal Thresholds Support */ +#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) +#define THERM_SHIFT_THRESHOLD0 8 +#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) +#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) +#define THERM_SHIFT_THRESHOLD1 16 +#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) +#define THERM_STATUS_THRESHOLD0 (1 << 6) +#define THERM_LOG_THRESHOLD0 (1 << 7) +#define THERM_STATUS_THRESHOLD1 (1 << 8) +#define THERM_LOG_THRESHOLD1 (1 << 9) + +/* MISC_ENABLE bits: architectural */ +#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 +#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) +#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 +#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) +#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 +#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) +#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 +#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 +#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) + +/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ +#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 +#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) +#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 +#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) +#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 +#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) + +#define MSR_IA32_TSC_DEADLINE 0x000006E0 + +/* P4/Xeon+ specific */ +#define MSR_IA32_MCG_EAX 0x00000180 +#define MSR_IA32_MCG_EBX 0x00000181 +#define MSR_IA32_MCG_ECX 0x00000182 +#define MSR_IA32_MCG_EDX 0x00000183 +#define MSR_IA32_MCG_ESI 0x00000184 +#define MSR_IA32_MCG_EDI 0x00000185 +#define MSR_IA32_MCG_EBP 0x00000186 +#define MSR_IA32_MCG_ESP 0x00000187 +#define MSR_IA32_MCG_EFLAGS 0x00000188 +#define MSR_IA32_MCG_EIP 0x00000189 +#define MSR_IA32_MCG_RESERVED 0x0000018a + +/* Pentium IV performance counter MSRs */ +#define MSR_P4_BPU_PERFCTR0 0x00000300 +#define MSR_P4_BPU_PERFCTR1 0x00000301 +#define MSR_P4_BPU_PERFCTR2 0x00000302 +#define MSR_P4_BPU_PERFCTR3 0x00000303 +#define MSR_P4_MS_PERFCTR0 0x00000304 +#define MSR_P4_MS_PERFCTR1 0x00000305 +#define MSR_P4_MS_PERFCTR2 0x00000306 +#define MSR_P4_MS_PERFCTR3 0x00000307 +#define MSR_P4_FLAME_PERFCTR0 0x00000308 +#define MSR_P4_FLAME_PERFCTR1 0x00000309 +#define MSR_P4_FLAME_PERFCTR2 0x0000030a +#define MSR_P4_FLAME_PERFCTR3 0x0000030b +#define MSR_P4_IQ_PERFCTR0 0x0000030c +#define MSR_P4_IQ_PERFCTR1 0x0000030d +#define MSR_P4_IQ_PERFCTR2 0x0000030e +#define MSR_P4_IQ_PERFCTR3 0x0000030f +#define MSR_P4_IQ_PERFCTR4 0x00000310 +#define MSR_P4_IQ_PERFCTR5 0x00000311 +#define MSR_P4_BPU_CCCR0 0x00000360 +#define MSR_P4_BPU_CCCR1 0x00000361 +#define MSR_P4_BPU_CCCR2 0x00000362 +#define MSR_P4_BPU_CCCR3 0x00000363 +#define MSR_P4_MS_CCCR0 0x00000364 +#define MSR_P4_MS_CCCR1 0x00000365 +#define MSR_P4_MS_CCCR2 0x00000366 +#define MSR_P4_MS_CCCR3 0x00000367 +#define MSR_P4_FLAME_CCCR0 0x00000368 +#define MSR_P4_FLAME_CCCR1 0x00000369 +#define MSR_P4_FLAME_CCCR2 0x0000036a +#define MSR_P4_FLAME_CCCR3 0x0000036b +#define MSR_P4_IQ_CCCR0 0x0000036c +#define MSR_P4_IQ_CCCR1 0x0000036d +#define MSR_P4_IQ_CCCR2 0x0000036e +#define MSR_P4_IQ_CCCR3 0x0000036f +#define MSR_P4_IQ_CCCR4 0x00000370 +#define MSR_P4_IQ_CCCR5 0x00000371 +#define MSR_P4_ALF_ESCR0 0x000003ca +#define MSR_P4_ALF_ESCR1 0x000003cb +#define MSR_P4_BPU_ESCR0 0x000003b2 +#define MSR_P4_BPU_ESCR1 0x000003b3 +#define MSR_P4_BSU_ESCR0 0x000003a0 +#define MSR_P4_BSU_ESCR1 0x000003a1 +#define MSR_P4_CRU_ESCR0 0x000003b8 +#define MSR_P4_CRU_ESCR1 0x000003b9 +#define MSR_P4_CRU_ESCR2 0x000003cc +#define MSR_P4_CRU_ESCR3 0x000003cd +#define MSR_P4_CRU_ESCR4 0x000003e0 +#define MSR_P4_CRU_ESCR5 0x000003e1 +#define MSR_P4_DAC_ESCR0 0x000003a8 +#define MSR_P4_DAC_ESCR1 0x000003a9 +#define MSR_P4_FIRM_ESCR0 0x000003a4 +#define MSR_P4_FIRM_ESCR1 0x000003a5 +#define MSR_P4_FLAME_ESCR0 0x000003a6 +#define MSR_P4_FLAME_ESCR1 0x000003a7 +#define MSR_P4_FSB_ESCR0 0x000003a2 +#define MSR_P4_FSB_ESCR1 0x000003a3 +#define MSR_P4_IQ_ESCR0 0x000003ba +#define MSR_P4_IQ_ESCR1 0x000003bb +#define MSR_P4_IS_ESCR0 0x000003b4 +#define MSR_P4_IS_ESCR1 0x000003b5 +#define MSR_P4_ITLB_ESCR0 0x000003b6 +#define MSR_P4_ITLB_ESCR1 0x000003b7 +#define MSR_P4_IX_ESCR0 0x000003c8 +#define MSR_P4_IX_ESCR1 0x000003c9 +#define MSR_P4_MOB_ESCR0 0x000003aa +#define MSR_P4_MOB_ESCR1 0x000003ab +#define MSR_P4_MS_ESCR0 0x000003c0 +#define MSR_P4_MS_ESCR1 0x000003c1 +#define MSR_P4_PMH_ESCR0 0x000003ac +#define MSR_P4_PMH_ESCR1 0x000003ad +#define MSR_P4_RAT_ESCR0 0x000003bc +#define MSR_P4_RAT_ESCR1 0x000003bd +#define MSR_P4_SAAT_ESCR0 0x000003ae +#define MSR_P4_SAAT_ESCR1 0x000003af +#define MSR_P4_SSU_ESCR0 0x000003be +#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ + +#define MSR_P4_TBPU_ESCR0 0x000003c2 +#define MSR_P4_TBPU_ESCR1 0x000003c3 +#define MSR_P4_TC_ESCR0 0x000003c4 +#define MSR_P4_TC_ESCR1 0x000003c5 +#define MSR_P4_U2L_ESCR0 0x000003b0 +#define MSR_P4_U2L_ESCR1 0x000003b1 + +#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 + +/* Intel Core-based CPU performance counters */ +#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 +#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a +#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b +#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d +#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e +#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f +#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 + +/* Geode defined MSRs */ +#define MSR_GEODE_BUSCONT_CONF0 0x00001900 + +/* Intel VT MSRs */ +#define MSR_IA32_VMX_BASIC 0x00000480 +#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 +#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 +#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 +#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 +#define MSR_IA32_VMX_MISC 0x00000485 +#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 +#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 +#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 +#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 +#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a +#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b +#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c +#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d +#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e +#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f +#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 +#define MSR_IA32_VMX_VMFUNC 0x00000491 + +/* VMX_BASIC bits and bitmasks */ +#define VMX_BASIC_VMCS_SIZE_SHIFT 32 +#define VMX_BASIC_TRUE_CTLS (1ULL << 55) +#define VMX_BASIC_64 0x0001000000000000LLU +#define VMX_BASIC_MEM_TYPE_SHIFT 50 +#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU +#define VMX_BASIC_MEM_TYPE_WB 6LLU +#define VMX_BASIC_INOUT 0x0040000000000000LLU + +/* MSR_IA32_VMX_MISC bits */ +#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) +#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F +/* AMD-V MSRs */ + +#define MSR_VM_CR 0xc0010114 +#define MSR_VM_IGNNE 0xc0010115 +#define MSR_VM_HSAVE_PA 0xc0010117 + +#endif /* _UAPI_ASM_X86_MSR_INDEX_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/x86/include/asm/msr-index.h | 694 +-------------------------------- arch/x86/include/uapi/asm/msr-index.h | 698 ++++++++++++++++++++++++++++++++++ 2 files changed, 699 insertions(+), 693 deletions(-) create mode 100644 arch/x86/include/uapi/asm/msr-index.h diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 710273c617b8..1baa0628da74 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -1,698 +1,6 @@ #ifndef _ASM_X86_MSR_INDEX_H #define _ASM_X86_MSR_INDEX_H -/* - * CPU model specific register (MSR) numbers. - * - * Do not add new entries to this file unless the definitions are shared - * between multiple compilation units. - */ - -/* x86-64 specific MSRs */ -#define MSR_EFER 0xc0000080 /* extended feature register */ -#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ -#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ -#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ -#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ -#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ -#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ -#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ -#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ - -/* EFER bits: */ -#define _EFER_SCE 0 /* SYSCALL/SYSRET */ -#define _EFER_LME 8 /* Long mode enable */ -#define _EFER_LMA 10 /* Long mode active (read-only) */ -#define _EFER_NX 11 /* No execute enable */ -#define _EFER_SVME 12 /* Enable virtualization */ -#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ -#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ - -#define EFER_SCE (1<<_EFER_SCE) -#define EFER_LME (1<<_EFER_LME) -#define EFER_LMA (1<<_EFER_LMA) -#define EFER_NX (1<<_EFER_NX) -#define EFER_SVME (1<<_EFER_SVME) -#define EFER_LMSLE (1<<_EFER_LMSLE) -#define EFER_FFXSR (1<<_EFER_FFXSR) - -/* Intel MSRs. Some also available on other CPUs */ - -#define MSR_PPIN_CTL 0x0000004e -#define MSR_PPIN 0x0000004f - -#define MSR_IA32_PERFCTR0 0x000000c1 -#define MSR_IA32_PERFCTR1 0x000000c2 -#define MSR_FSB_FREQ 0x000000cd -#define MSR_PLATFORM_INFO 0x000000ce - -#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 -#define NHM_C3_AUTO_DEMOTE (1UL << 25) -#define NHM_C1_AUTO_DEMOTE (1UL << 26) -#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) -#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) -#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) - -#define MSR_MTRRcap 0x000000fe -#define MSR_IA32_BBL_CR_CTL 0x00000119 -#define MSR_IA32_BBL_CR_CTL3 0x0000011e - -#define MSR_IA32_SYSENTER_CS 0x00000174 -#define MSR_IA32_SYSENTER_ESP 0x00000175 -#define MSR_IA32_SYSENTER_EIP 0x00000176 - -#define MSR_IA32_MCG_CAP 0x00000179 -#define MSR_IA32_MCG_STATUS 0x0000017a -#define MSR_IA32_MCG_CTL 0x0000017b -#define MSR_IA32_MCG_EXT_CTL 0x000004d0 - -#define MSR_OFFCORE_RSP_0 0x000001a6 -#define MSR_OFFCORE_RSP_1 0x000001a7 -#define MSR_TURBO_RATIO_LIMIT 0x000001ad -#define MSR_TURBO_RATIO_LIMIT1 0x000001ae -#define MSR_TURBO_RATIO_LIMIT2 0x000001af - -#define MSR_LBR_SELECT 0x000001c8 -#define MSR_LBR_TOS 0x000001c9 -#define MSR_LBR_NHM_FROM 0x00000680 -#define MSR_LBR_NHM_TO 0x000006c0 -#define MSR_LBR_CORE_FROM 0x00000040 -#define MSR_LBR_CORE_TO 0x00000060 - -#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ -#define LBR_INFO_MISPRED BIT_ULL(63) -#define LBR_INFO_IN_TX BIT_ULL(62) -#define LBR_INFO_ABORT BIT_ULL(61) -#define LBR_INFO_CYCLES 0xffff - -#define MSR_IA32_PEBS_ENABLE 0x000003f1 -#define MSR_IA32_DS_AREA 0x00000600 -#define MSR_IA32_PERF_CAPABILITIES 0x00000345 -#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 - -#define MSR_IA32_RTIT_CTL 0x00000570 -#define MSR_IA32_RTIT_STATUS 0x00000571 -#define MSR_IA32_RTIT_ADDR0_A 0x00000580 -#define MSR_IA32_RTIT_ADDR0_B 0x00000581 -#define MSR_IA32_RTIT_ADDR1_A 0x00000582 -#define MSR_IA32_RTIT_ADDR1_B 0x00000583 -#define MSR_IA32_RTIT_ADDR2_A 0x00000584 -#define MSR_IA32_RTIT_ADDR2_B 0x00000585 -#define MSR_IA32_RTIT_ADDR3_A 0x00000586 -#define MSR_IA32_RTIT_ADDR3_B 0x00000587 -#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 -#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 -#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 - -#define MSR_MTRRfix64K_00000 0x00000250 -#define MSR_MTRRfix16K_80000 0x00000258 -#define MSR_MTRRfix16K_A0000 0x00000259 -#define MSR_MTRRfix4K_C0000 0x00000268 -#define MSR_MTRRfix4K_C8000 0x00000269 -#define MSR_MTRRfix4K_D0000 0x0000026a -#define MSR_MTRRfix4K_D8000 0x0000026b -#define MSR_MTRRfix4K_E0000 0x0000026c -#define MSR_MTRRfix4K_E8000 0x0000026d -#define MSR_MTRRfix4K_F0000 0x0000026e -#define MSR_MTRRfix4K_F8000 0x0000026f -#define MSR_MTRRdefType 0x000002ff - -#define MSR_IA32_CR_PAT 0x00000277 - -#define MSR_IA32_DEBUGCTLMSR 0x000001d9 -#define MSR_IA32_LASTBRANCHFROMIP 0x000001db -#define MSR_IA32_LASTBRANCHTOIP 0x000001dc -#define MSR_IA32_LASTINTFROMIP 0x000001dd -#define MSR_IA32_LASTINTTOIP 0x000001de - -/* DEBUGCTLMSR bits (others vary by model): */ -#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ -#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ -#define DEBUGCTLMSR_TR (1UL << 6) -#define DEBUGCTLMSR_BTS (1UL << 7) -#define DEBUGCTLMSR_BTINT (1UL << 8) -#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) -#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) -#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) - -#define MSR_PEBS_FRONTEND 0x000003f7 - -#define MSR_IA32_POWER_CTL 0x000001fc - -#define MSR_IA32_MC0_CTL 0x00000400 -#define MSR_IA32_MC0_STATUS 0x00000401 -#define MSR_IA32_MC0_ADDR 0x00000402 -#define MSR_IA32_MC0_MISC 0x00000403 - -/* C-state Residency Counters */ -#define MSR_PKG_C3_RESIDENCY 0x000003f8 -#define MSR_PKG_C6_RESIDENCY 0x000003f9 -#define MSR_PKG_C7_RESIDENCY 0x000003fa -#define MSR_CORE_C3_RESIDENCY 0x000003fc -#define MSR_CORE_C6_RESIDENCY 0x000003fd -#define MSR_CORE_C7_RESIDENCY 0x000003fe -#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff -#define MSR_PKG_C2_RESIDENCY 0x0000060d -#define MSR_PKG_C8_RESIDENCY 0x00000630 -#define MSR_PKG_C9_RESIDENCY 0x00000631 -#define MSR_PKG_C10_RESIDENCY 0x00000632 - -/* Interrupt Response Limit */ -#define MSR_PKGC3_IRTL 0x0000060a -#define MSR_PKGC6_IRTL 0x0000060b -#define MSR_PKGC7_IRTL 0x0000060c -#define MSR_PKGC8_IRTL 0x00000633 -#define MSR_PKGC9_IRTL 0x00000634 -#define MSR_PKGC10_IRTL 0x00000635 - -/* Run Time Average Power Limiting (RAPL) Interface */ - -#define MSR_RAPL_POWER_UNIT 0x00000606 - -#define MSR_PKG_POWER_LIMIT 0x00000610 -#define MSR_PKG_ENERGY_STATUS 0x00000611 -#define MSR_PKG_PERF_STATUS 0x00000613 -#define MSR_PKG_POWER_INFO 0x00000614 - -#define MSR_DRAM_POWER_LIMIT 0x00000618 -#define MSR_DRAM_ENERGY_STATUS 0x00000619 -#define MSR_DRAM_PERF_STATUS 0x0000061b -#define MSR_DRAM_POWER_INFO 0x0000061c - -#define MSR_PP0_POWER_LIMIT 0x00000638 -#define MSR_PP0_ENERGY_STATUS 0x00000639 -#define MSR_PP0_POLICY 0x0000063a -#define MSR_PP0_PERF_STATUS 0x0000063b - -#define MSR_PP1_POWER_LIMIT 0x00000640 -#define MSR_PP1_ENERGY_STATUS 0x00000641 -#define MSR_PP1_POLICY 0x00000642 - -/* Config TDP MSRs */ -#define MSR_CONFIG_TDP_NOMINAL 0x00000648 -#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 -#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A -#define MSR_CONFIG_TDP_CONTROL 0x0000064B -#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C - -#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D - -#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 -#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 -#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A -#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B - -#define MSR_CORE_C1_RES 0x00000660 - -#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 -#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 - -#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 -#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 -#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 - -/* Hardware P state interface */ -#define MSR_PPERF 0x0000064e -#define MSR_PERF_LIMIT_REASONS 0x0000064f -#define MSR_PM_ENABLE 0x00000770 -#define MSR_HWP_CAPABILITIES 0x00000771 -#define MSR_HWP_REQUEST_PKG 0x00000772 -#define MSR_HWP_INTERRUPT 0x00000773 -#define MSR_HWP_REQUEST 0x00000774 -#define MSR_HWP_STATUS 0x00000777 - -/* CPUID.6.EAX */ -#define HWP_BASE_BIT (1<<7) -#define HWP_NOTIFICATIONS_BIT (1<<8) -#define HWP_ACTIVITY_WINDOW_BIT (1<<9) -#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) -#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) - -/* IA32_HWP_CAPABILITIES */ -#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) -#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) -#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) -#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) - -/* IA32_HWP_REQUEST */ -#define HWP_MIN_PERF(x) (x & 0xff) -#define HWP_MAX_PERF(x) ((x & 0xff) << 8) -#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) -#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) -#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) -#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) - -/* IA32_HWP_STATUS */ -#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) - -/* IA32_HWP_INTERRUPT */ -#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) - -#define MSR_AMD64_MC0_MASK 0xc0010044 - -#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) -#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) -#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) -#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) - -#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) - -/* These are consecutive and not in the normal 4er MCE bank block */ -#define MSR_IA32_MC0_CTL2 0x00000280 -#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) - -#define MSR_P6_PERFCTR0 0x000000c1 -#define MSR_P6_PERFCTR1 0x000000c2 -#define MSR_P6_EVNTSEL0 0x00000186 -#define MSR_P6_EVNTSEL1 0x00000187 - -#define MSR_KNC_PERFCTR0 0x00000020 -#define MSR_KNC_PERFCTR1 0x00000021 -#define MSR_KNC_EVNTSEL0 0x00000028 -#define MSR_KNC_EVNTSEL1 0x00000029 - -/* Alternative perfctr range with full access. */ -#define MSR_IA32_PMC0 0x000004c1 - -/* AMD64 MSRs. Not complete. See the architecture manual for a more - complete list. */ - -#define MSR_AMD64_PATCH_LEVEL 0x0000008b -#define MSR_AMD64_TSC_RATIO 0xc0000104 -#define MSR_AMD64_NB_CFG 0xc001001f -#define MSR_AMD64_PATCH_LOADER 0xc0010020 -#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 -#define MSR_AMD64_OSVW_STATUS 0xc0010141 -#define MSR_AMD64_LS_CFG 0xc0011020 -#define MSR_AMD64_DC_CFG 0xc0011022 -#define MSR_AMD64_BU_CFG2 0xc001102a -#define MSR_AMD64_IBSFETCHCTL 0xc0011030 -#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 -#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 -#define MSR_AMD64_IBSFETCH_REG_COUNT 3 -#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) -#define MSR_AMD64_IBSOPCTL 0xc0011033 -#define MSR_AMD64_IBSOPRIP 0xc0011034 -#define MSR_AMD64_IBSOPDATA 0xc0011035 -#define MSR_AMD64_IBSOPDATA2 0xc0011036 -#define MSR_AMD64_IBSOPDATA3 0xc0011037 -#define MSR_AMD64_IBSDCLINAD 0xc0011038 -#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 -#define MSR_AMD64_IBSOP_REG_COUNT 7 -#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) -#define MSR_AMD64_IBSCTL 0xc001103a -#define MSR_AMD64_IBSBRTARGET 0xc001103b -#define MSR_AMD64_IBSOPDATA4 0xc001103d -#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ - -/* Fam 17h MSRs */ -#define MSR_F17H_IRPERF 0xc00000e9 - -/* Fam 16h MSRs */ -#define MSR_F16H_L2I_PERF_CTL 0xc0010230 -#define MSR_F16H_L2I_PERF_CTR 0xc0010231 -#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 -#define MSR_F16H_DR2_ADDR_MASK 0xc001101a -#define MSR_F16H_DR3_ADDR_MASK 0xc001101b -#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 - -/* Fam 15h MSRs */ -#define MSR_F15H_PERF_CTL 0xc0010200 -#define MSR_F15H_PERF_CTR 0xc0010201 -#define MSR_F15H_NB_PERF_CTL 0xc0010240 -#define MSR_F15H_NB_PERF_CTR 0xc0010241 -#define MSR_F15H_PTSC 0xc0010280 -#define MSR_F15H_IC_CFG 0xc0011021 - -/* Fam 10h MSRs */ -#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 -#define FAM10H_MMIO_CONF_ENABLE (1<<0) -#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf -#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 -#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL -#define FAM10H_MMIO_CONF_BASE_SHIFT 20 -#define MSR_FAM10H_NODE_ID 0xc001100c - -/* K8 MSRs */ -#define MSR_K8_TOP_MEM1 0xc001001a -#define MSR_K8_TOP_MEM2 0xc001001d -#define MSR_K8_SYSCFG 0xc0010010 -#define MSR_K8_INT_PENDING_MSG 0xc0010055 -/* C1E active bits in int pending message */ -#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 -#define MSR_K8_TSEG_ADDR 0xc0010112 -#define MSR_K8_TSEG_MASK 0xc0010113 -#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ -#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ -#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ - -/* K7 MSRs */ -#define MSR_K7_EVNTSEL0 0xc0010000 -#define MSR_K7_PERFCTR0 0xc0010004 -#define MSR_K7_EVNTSEL1 0xc0010001 -#define MSR_K7_PERFCTR1 0xc0010005 -#define MSR_K7_EVNTSEL2 0xc0010002 -#define MSR_K7_PERFCTR2 0xc0010006 -#define MSR_K7_EVNTSEL3 0xc0010003 -#define MSR_K7_PERFCTR3 0xc0010007 -#define MSR_K7_CLK_CTL 0xc001001b -#define MSR_K7_HWCR 0xc0010015 -#define MSR_K7_FID_VID_CTL 0xc0010041 -#define MSR_K7_FID_VID_STATUS 0xc0010042 - -/* K6 MSRs */ -#define MSR_K6_WHCR 0xc0000082 -#define MSR_K6_UWCCR 0xc0000085 -#define MSR_K6_EPMR 0xc0000086 -#define MSR_K6_PSOR 0xc0000087 -#define MSR_K6_PFIR 0xc0000088 - -/* Centaur-Hauls/IDT defined MSRs. */ -#define MSR_IDT_FCR1 0x00000107 -#define MSR_IDT_FCR2 0x00000108 -#define MSR_IDT_FCR3 0x00000109 -#define MSR_IDT_FCR4 0x0000010a - -#define MSR_IDT_MCR0 0x00000110 -#define MSR_IDT_MCR1 0x00000111 -#define MSR_IDT_MCR2 0x00000112 -#define MSR_IDT_MCR3 0x00000113 -#define MSR_IDT_MCR4 0x00000114 -#define MSR_IDT_MCR5 0x00000115 -#define MSR_IDT_MCR6 0x00000116 -#define MSR_IDT_MCR7 0x00000117 -#define MSR_IDT_MCR_CTRL 0x00000120 - -/* VIA Cyrix defined MSRs*/ -#define MSR_VIA_FCR 0x00001107 -#define MSR_VIA_LONGHAUL 0x0000110a -#define MSR_VIA_RNG 0x0000110b -#define MSR_VIA_BCR2 0x00001147 - -/* Transmeta defined MSRs */ -#define MSR_TMTA_LONGRUN_CTRL 0x80868010 -#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 -#define MSR_TMTA_LRTI_READOUT 0x80868018 -#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a - -/* Intel defined MSRs. */ -#define MSR_IA32_P5_MC_ADDR 0x00000000 -#define MSR_IA32_P5_MC_TYPE 0x00000001 -#define MSR_IA32_TSC 0x00000010 -#define MSR_IA32_PLATFORM_ID 0x00000017 -#define MSR_IA32_EBL_CR_POWERON 0x0000002a -#define MSR_EBC_FREQUENCY_ID 0x0000002c -#define MSR_SMI_COUNT 0x00000034 -#define MSR_IA32_FEATURE_CONTROL 0x0000003a -#define MSR_IA32_TSC_ADJUST 0x0000003b -#define MSR_IA32_BNDCFGS 0x00000d90 - -#define MSR_IA32_XSS 0x00000da0 - -#define FEATURE_CONTROL_LOCKED (1<<0) -#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) -#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) -#define FEATURE_CONTROL_LMCE (1<<20) - -#define MSR_IA32_APICBASE 0x0000001b -#define MSR_IA32_APICBASE_BSP (1<<8) -#define MSR_IA32_APICBASE_ENABLE (1<<11) -#define MSR_IA32_APICBASE_BASE (0xfffff<<12) - -#define MSR_IA32_TSCDEADLINE 0x000006e0 - -#define MSR_IA32_UCODE_WRITE 0x00000079 -#define MSR_IA32_UCODE_REV 0x0000008b - -#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b -#define MSR_IA32_SMBASE 0x0000009e - -#define MSR_IA32_PERF_STATUS 0x00000198 -#define MSR_IA32_PERF_CTL 0x00000199 -#define INTEL_PERF_CTL_MASK 0xffff -#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 -#define MSR_AMD_PERF_STATUS 0xc0010063 -#define MSR_AMD_PERF_CTL 0xc0010062 - -#define MSR_IA32_MPERF 0x000000e7 -#define MSR_IA32_APERF 0x000000e8 - -#define MSR_IA32_THERM_CONTROL 0x0000019a -#define MSR_IA32_THERM_INTERRUPT 0x0000019b - -#define THERM_INT_HIGH_ENABLE (1 << 0) -#define THERM_INT_LOW_ENABLE (1 << 1) -#define THERM_INT_PLN_ENABLE (1 << 24) - -#define MSR_IA32_THERM_STATUS 0x0000019c - -#define THERM_STATUS_PROCHOT (1 << 0) -#define THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_THERM2_CTL 0x0000019d - -#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) - -#define MSR_IA32_MISC_ENABLE 0x000001a0 - -#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 - -#define MSR_MISC_PWR_MGMT 0x000001aa - -#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 -#define ENERGY_PERF_BIAS_PERFORMANCE 0 -#define ENERGY_PERF_BIAS_NORMAL 6 -#define ENERGY_PERF_BIAS_POWERSAVE 15 - -#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 - -#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) -#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 - -#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) -#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) -#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) - -/* Thermal Thresholds Support */ -#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) -#define THERM_SHIFT_THRESHOLD0 8 -#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) -#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) -#define THERM_SHIFT_THRESHOLD1 16 -#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) -#define THERM_STATUS_THRESHOLD0 (1 << 6) -#define THERM_LOG_THRESHOLD0 (1 << 7) -#define THERM_STATUS_THRESHOLD1 (1 << 8) -#define THERM_LOG_THRESHOLD1 (1 << 9) - -/* MISC_ENABLE bits: architectural */ -#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 -#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) -#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 -#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) -#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 -#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) -#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 -#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 -#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) - -/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ -#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 -#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) -#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 -#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) -#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 -#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) - -#define MSR_IA32_TSC_DEADLINE 0x000006E0 - -/* P4/Xeon+ specific */ -#define MSR_IA32_MCG_EAX 0x00000180 -#define MSR_IA32_MCG_EBX 0x00000181 -#define MSR_IA32_MCG_ECX 0x00000182 -#define MSR_IA32_MCG_EDX 0x00000183 -#define MSR_IA32_MCG_ESI 0x00000184 -#define MSR_IA32_MCG_EDI 0x00000185 -#define MSR_IA32_MCG_EBP 0x00000186 -#define MSR_IA32_MCG_ESP 0x00000187 -#define MSR_IA32_MCG_EFLAGS 0x00000188 -#define MSR_IA32_MCG_EIP 0x00000189 -#define MSR_IA32_MCG_RESERVED 0x0000018a - -/* Pentium IV performance counter MSRs */ -#define MSR_P4_BPU_PERFCTR0 0x00000300 -#define MSR_P4_BPU_PERFCTR1 0x00000301 -#define MSR_P4_BPU_PERFCTR2 0x00000302 -#define MSR_P4_BPU_PERFCTR3 0x00000303 -#define MSR_P4_MS_PERFCTR0 0x00000304 -#define MSR_P4_MS_PERFCTR1 0x00000305 -#define MSR_P4_MS_PERFCTR2 0x00000306 -#define MSR_P4_MS_PERFCTR3 0x00000307 -#define MSR_P4_FLAME_PERFCTR0 0x00000308 -#define MSR_P4_FLAME_PERFCTR1 0x00000309 -#define MSR_P4_FLAME_PERFCTR2 0x0000030a -#define MSR_P4_FLAME_PERFCTR3 0x0000030b -#define MSR_P4_IQ_PERFCTR0 0x0000030c -#define MSR_P4_IQ_PERFCTR1 0x0000030d -#define MSR_P4_IQ_PERFCTR2 0x0000030e -#define MSR_P4_IQ_PERFCTR3 0x0000030f -#define MSR_P4_IQ_PERFCTR4 0x00000310 -#define MSR_P4_IQ_PERFCTR5 0x00000311 -#define MSR_P4_BPU_CCCR0 0x00000360 -#define MSR_P4_BPU_CCCR1 0x00000361 -#define MSR_P4_BPU_CCCR2 0x00000362 -#define MSR_P4_BPU_CCCR3 0x00000363 -#define MSR_P4_MS_CCCR0 0x00000364 -#define MSR_P4_MS_CCCR1 0x00000365 -#define MSR_P4_MS_CCCR2 0x00000366 -#define MSR_P4_MS_CCCR3 0x00000367 -#define MSR_P4_FLAME_CCCR0 0x00000368 -#define MSR_P4_FLAME_CCCR1 0x00000369 -#define MSR_P4_FLAME_CCCR2 0x0000036a -#define MSR_P4_FLAME_CCCR3 0x0000036b -#define MSR_P4_IQ_CCCR0 0x0000036c -#define MSR_P4_IQ_CCCR1 0x0000036d -#define MSR_P4_IQ_CCCR2 0x0000036e -#define MSR_P4_IQ_CCCR3 0x0000036f -#define MSR_P4_IQ_CCCR4 0x00000370 -#define MSR_P4_IQ_CCCR5 0x00000371 -#define MSR_P4_ALF_ESCR0 0x000003ca -#define MSR_P4_ALF_ESCR1 0x000003cb -#define MSR_P4_BPU_ESCR0 0x000003b2 -#define MSR_P4_BPU_ESCR1 0x000003b3 -#define MSR_P4_BSU_ESCR0 0x000003a0 -#define MSR_P4_BSU_ESCR1 0x000003a1 -#define MSR_P4_CRU_ESCR0 0x000003b8 -#define MSR_P4_CRU_ESCR1 0x000003b9 -#define MSR_P4_CRU_ESCR2 0x000003cc -#define MSR_P4_CRU_ESCR3 0x000003cd -#define MSR_P4_CRU_ESCR4 0x000003e0 -#define MSR_P4_CRU_ESCR5 0x000003e1 -#define MSR_P4_DAC_ESCR0 0x000003a8 -#define MSR_P4_DAC_ESCR1 0x000003a9 -#define MSR_P4_FIRM_ESCR0 0x000003a4 -#define MSR_P4_FIRM_ESCR1 0x000003a5 -#define MSR_P4_FLAME_ESCR0 0x000003a6 -#define MSR_P4_FLAME_ESCR1 0x000003a7 -#define MSR_P4_FSB_ESCR0 0x000003a2 -#define MSR_P4_FSB_ESCR1 0x000003a3 -#define MSR_P4_IQ_ESCR0 0x000003ba -#define MSR_P4_IQ_ESCR1 0x000003bb -#define MSR_P4_IS_ESCR0 0x000003b4 -#define MSR_P4_IS_ESCR1 0x000003b5 -#define MSR_P4_ITLB_ESCR0 0x000003b6 -#define MSR_P4_ITLB_ESCR1 0x000003b7 -#define MSR_P4_IX_ESCR0 0x000003c8 -#define MSR_P4_IX_ESCR1 0x000003c9 -#define MSR_P4_MOB_ESCR0 0x000003aa -#define MSR_P4_MOB_ESCR1 0x000003ab -#define MSR_P4_MS_ESCR0 0x000003c0 -#define MSR_P4_MS_ESCR1 0x000003c1 -#define MSR_P4_PMH_ESCR0 0x000003ac -#define MSR_P4_PMH_ESCR1 0x000003ad -#define MSR_P4_RAT_ESCR0 0x000003bc -#define MSR_P4_RAT_ESCR1 0x000003bd -#define MSR_P4_SAAT_ESCR0 0x000003ae -#define MSR_P4_SAAT_ESCR1 0x000003af -#define MSR_P4_SSU_ESCR0 0x000003be -#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ - -#define MSR_P4_TBPU_ESCR0 0x000003c2 -#define MSR_P4_TBPU_ESCR1 0x000003c3 -#define MSR_P4_TC_ESCR0 0x000003c4 -#define MSR_P4_TC_ESCR1 0x000003c5 -#define MSR_P4_U2L_ESCR0 0x000003b0 -#define MSR_P4_U2L_ESCR1 0x000003b1 - -#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 - -/* Intel Core-based CPU performance counters */ -#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 -#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a -#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b -#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d -#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e -#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f -#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 - -/* Geode defined MSRs */ -#define MSR_GEODE_BUSCONT_CONF0 0x00001900 - -/* Intel VT MSRs */ -#define MSR_IA32_VMX_BASIC 0x00000480 -#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 -#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 -#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 -#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 -#define MSR_IA32_VMX_MISC 0x00000485 -#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 -#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 -#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 -#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 -#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a -#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b -#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c -#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d -#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e -#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f -#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 -#define MSR_IA32_VMX_VMFUNC 0x00000491 - -/* VMX_BASIC bits and bitmasks */ -#define VMX_BASIC_VMCS_SIZE_SHIFT 32 -#define VMX_BASIC_TRUE_CTLS (1ULL << 55) -#define VMX_BASIC_64 0x0001000000000000LLU -#define VMX_BASIC_MEM_TYPE_SHIFT 50 -#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU -#define VMX_BASIC_MEM_TYPE_WB 6LLU -#define VMX_BASIC_INOUT 0x0040000000000000LLU - -/* MSR_IA32_VMX_MISC bits */ -#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) -#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F -/* AMD-V MSRs */ - -#define MSR_VM_CR 0xc0010114 -#define MSR_VM_IGNNE 0xc0010115 -#define MSR_VM_HSAVE_PA 0xc0010117 +#include <uapi/asm/msr-index.h> #endif /* _ASM_X86_MSR_INDEX_H */ diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h new file mode 100644 index 000000000000..d097e832ee3c --- /dev/null +++ b/arch/x86/include/uapi/asm/msr-index.h @@ -0,0 +1,698 @@ +#ifndef _UAPI_ASM_X86_MSR_INDEX_H +#define _UAPI_ASM_X86_MSR_INDEX_H + +/* + * CPU model specific register (MSR) numbers. + * + * Do not add new entries to this file unless the definitions are shared + * between multiple compilation units. + */ + +/* x86-64 specific MSRs */ +#define MSR_EFER 0xc0000080 /* extended feature register */ +#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ +#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ +#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ +#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ +#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ +#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ +#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ +#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ + +/* EFER bits: */ +#define _EFER_SCE 0 /* SYSCALL/SYSRET */ +#define _EFER_LME 8 /* Long mode enable */ +#define _EFER_LMA 10 /* Long mode active (read-only) */ +#define _EFER_NX 11 /* No execute enable */ +#define _EFER_SVME 12 /* Enable virtualization */ +#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ +#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ + +#define EFER_SCE (1<<_EFER_SCE) +#define EFER_LME (1<<_EFER_LME) +#define EFER_LMA (1<<_EFER_LMA) +#define EFER_NX (1<<_EFER_NX) +#define EFER_SVME (1<<_EFER_SVME) +#define EFER_LMSLE (1<<_EFER_LMSLE) +#define EFER_FFXSR (1<<_EFER_FFXSR) + +/* Intel MSRs. Some also available on other CPUs */ + +#define MSR_PPIN_CTL 0x0000004e +#define MSR_PPIN 0x0000004f + +#define MSR_IA32_PERFCTR0 0x000000c1 +#define MSR_IA32_PERFCTR1 0x000000c2 +#define MSR_FSB_FREQ 0x000000cd +#define MSR_PLATFORM_INFO 0x000000ce + +#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 +#define NHM_C3_AUTO_DEMOTE (1UL << 25) +#define NHM_C1_AUTO_DEMOTE (1UL << 26) +#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) +#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) +#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) + +#define MSR_MTRRcap 0x000000fe +#define MSR_IA32_BBL_CR_CTL 0x00000119 +#define MSR_IA32_BBL_CR_CTL3 0x0000011e + +#define MSR_IA32_SYSENTER_CS 0x00000174 +#define MSR_IA32_SYSENTER_ESP 0x00000175 +#define MSR_IA32_SYSENTER_EIP 0x00000176 + +#define MSR_IA32_MCG_CAP 0x00000179 +#define MSR_IA32_MCG_STATUS 0x0000017a +#define MSR_IA32_MCG_CTL 0x0000017b +#define MSR_IA32_MCG_EXT_CTL 0x000004d0 + +#define MSR_OFFCORE_RSP_0 0x000001a6 +#define MSR_OFFCORE_RSP_1 0x000001a7 +#define MSR_TURBO_RATIO_LIMIT 0x000001ad +#define MSR_TURBO_RATIO_LIMIT1 0x000001ae +#define MSR_TURBO_RATIO_LIMIT2 0x000001af + +#define MSR_LBR_SELECT 0x000001c8 +#define MSR_LBR_TOS 0x000001c9 +#define MSR_LBR_NHM_FROM 0x00000680 +#define MSR_LBR_NHM_TO 0x000006c0 +#define MSR_LBR_CORE_FROM 0x00000040 +#define MSR_LBR_CORE_TO 0x00000060 + +#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ +#define LBR_INFO_MISPRED BIT_ULL(63) +#define LBR_INFO_IN_TX BIT_ULL(62) +#define LBR_INFO_ABORT BIT_ULL(61) +#define LBR_INFO_CYCLES 0xffff + +#define MSR_IA32_PEBS_ENABLE 0x000003f1 +#define MSR_IA32_DS_AREA 0x00000600 +#define MSR_IA32_PERF_CAPABILITIES 0x00000345 +#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 + +#define MSR_IA32_RTIT_CTL 0x00000570 +#define MSR_IA32_RTIT_STATUS 0x00000571 +#define MSR_IA32_RTIT_ADDR0_A 0x00000580 +#define MSR_IA32_RTIT_ADDR0_B 0x00000581 +#define MSR_IA32_RTIT_ADDR1_A 0x00000582 +#define MSR_IA32_RTIT_ADDR1_B 0x00000583 +#define MSR_IA32_RTIT_ADDR2_A 0x00000584 +#define MSR_IA32_RTIT_ADDR2_B 0x00000585 +#define MSR_IA32_RTIT_ADDR3_A 0x00000586 +#define MSR_IA32_RTIT_ADDR3_B 0x00000587 +#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 +#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 +#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 + +#define MSR_MTRRfix64K_00000 0x00000250 +#define MSR_MTRRfix16K_80000 0x00000258 +#define MSR_MTRRfix16K_A0000 0x00000259 +#define MSR_MTRRfix4K_C0000 0x00000268 +#define MSR_MTRRfix4K_C8000 0x00000269 +#define MSR_MTRRfix4K_D0000 0x0000026a +#define MSR_MTRRfix4K_D8000 0x0000026b +#define MSR_MTRRfix4K_E0000 0x0000026c +#define MSR_MTRRfix4K_E8000 0x0000026d +#define MSR_MTRRfix4K_F0000 0x0000026e +#define MSR_MTRRfix4K_F8000 0x0000026f +#define MSR_MTRRdefType 0x000002ff + +#define MSR_IA32_CR_PAT 0x00000277 + +#define MSR_IA32_DEBUGCTLMSR 0x000001d9 +#define MSR_IA32_LASTBRANCHFROMIP 0x000001db +#define MSR_IA32_LASTBRANCHTOIP 0x000001dc +#define MSR_IA32_LASTINTFROMIP 0x000001dd +#define MSR_IA32_LASTINTTOIP 0x000001de + +/* DEBUGCTLMSR bits (others vary by model): */ +#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ +#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ +#define DEBUGCTLMSR_TR (1UL << 6) +#define DEBUGCTLMSR_BTS (1UL << 7) +#define DEBUGCTLMSR_BTINT (1UL << 8) +#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) +#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) +#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) + +#define MSR_PEBS_FRONTEND 0x000003f7 + +#define MSR_IA32_POWER_CTL 0x000001fc + +#define MSR_IA32_MC0_CTL 0x00000400 +#define MSR_IA32_MC0_STATUS 0x00000401 +#define MSR_IA32_MC0_ADDR 0x00000402 +#define MSR_IA32_MC0_MISC 0x00000403 + +/* C-state Residency Counters */ +#define MSR_PKG_C3_RESIDENCY 0x000003f8 +#define MSR_PKG_C6_RESIDENCY 0x000003f9 +#define MSR_PKG_C7_RESIDENCY 0x000003fa +#define MSR_CORE_C3_RESIDENCY 0x000003fc +#define MSR_CORE_C6_RESIDENCY 0x000003fd +#define MSR_CORE_C7_RESIDENCY 0x000003fe +#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff +#define MSR_PKG_C2_RESIDENCY 0x0000060d +#define MSR_PKG_C8_RESIDENCY 0x00000630 +#define MSR_PKG_C9_RESIDENCY 0x00000631 +#define MSR_PKG_C10_RESIDENCY 0x00000632 + +/* Interrupt Response Limit */ +#define MSR_PKGC3_IRTL 0x0000060a +#define MSR_PKGC6_IRTL 0x0000060b +#define MSR_PKGC7_IRTL 0x0000060c +#define MSR_PKGC8_IRTL 0x00000633 +#define MSR_PKGC9_IRTL 0x00000634 +#define MSR_PKGC10_IRTL 0x00000635 + +/* Run Time Average Power Limiting (RAPL) Interface */ + +#define MSR_RAPL_POWER_UNIT 0x00000606 + +#define MSR_PKG_POWER_LIMIT 0x00000610 +#define MSR_PKG_ENERGY_STATUS 0x00000611 +#define MSR_PKG_PERF_STATUS 0x00000613 +#define MSR_PKG_POWER_INFO 0x00000614 + +#define MSR_DRAM_POWER_LIMIT 0x00000618 +#define MSR_DRAM_ENERGY_STATUS 0x00000619 +#define MSR_DRAM_PERF_STATUS 0x0000061b +#define MSR_DRAM_POWER_INFO 0x0000061c + +#define MSR_PP0_POWER_LIMIT 0x00000638 +#define MSR_PP0_ENERGY_STATUS 0x00000639 +#define MSR_PP0_POLICY 0x0000063a +#define MSR_PP0_PERF_STATUS 0x0000063b + +#define MSR_PP1_POWER_LIMIT 0x00000640 +#define MSR_PP1_ENERGY_STATUS 0x00000641 +#define MSR_PP1_POLICY 0x00000642 + +/* Config TDP MSRs */ +#define MSR_CONFIG_TDP_NOMINAL 0x00000648 +#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 +#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A +#define MSR_CONFIG_TDP_CONTROL 0x0000064B +#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C + +#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D + +#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 +#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 +#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A +#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B + +#define MSR_CORE_C1_RES 0x00000660 + +#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 +#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 + +#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 +#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 +#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 + +/* Hardware P state interface */ +#define MSR_PPERF 0x0000064e +#define MSR_PERF_LIMIT_REASONS 0x0000064f +#define MSR_PM_ENABLE 0x00000770 +#define MSR_HWP_CAPABILITIES 0x00000771 +#define MSR_HWP_REQUEST_PKG 0x00000772 +#define MSR_HWP_INTERRUPT 0x00000773 +#define MSR_HWP_REQUEST 0x00000774 +#define MSR_HWP_STATUS 0x00000777 + +/* CPUID.6.EAX */ +#define HWP_BASE_BIT (1<<7) +#define HWP_NOTIFICATIONS_BIT (1<<8) +#define HWP_ACTIVITY_WINDOW_BIT (1<<9) +#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) +#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) + +/* IA32_HWP_CAPABILITIES */ +#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) +#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) +#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) +#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) + +/* IA32_HWP_REQUEST */ +#define HWP_MIN_PERF(x) (x & 0xff) +#define HWP_MAX_PERF(x) ((x & 0xff) << 8) +#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) +#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) +#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) +#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) + +/* IA32_HWP_STATUS */ +#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) + +/* IA32_HWP_INTERRUPT */ +#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) + +#define MSR_AMD64_MC0_MASK 0xc0010044 + +#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) +#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) +#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) +#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) + +#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) + +/* These are consecutive and not in the normal 4er MCE bank block */ +#define MSR_IA32_MC0_CTL2 0x00000280 +#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) + +#define MSR_P6_PERFCTR0 0x000000c1 +#define MSR_P6_PERFCTR1 0x000000c2 +#define MSR_P6_EVNTSEL0 0x00000186 +#define MSR_P6_EVNTSEL1 0x00000187 + +#define MSR_KNC_PERFCTR0 0x00000020 +#define MSR_KNC_PERFCTR1 0x00000021 +#define MSR_KNC_EVNTSEL0 0x00000028 +#define MSR_KNC_EVNTSEL1 0x00000029 + +/* Alternative perfctr range with full access. */ +#define MSR_IA32_PMC0 0x000004c1 + +/* AMD64 MSRs. Not complete. See the architecture manual for a more + complete list. */ + +#define MSR_AMD64_PATCH_LEVEL 0x0000008b +#define MSR_AMD64_TSC_RATIO 0xc0000104 +#define MSR_AMD64_NB_CFG 0xc001001f +#define MSR_AMD64_PATCH_LOADER 0xc0010020 +#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 +#define MSR_AMD64_OSVW_STATUS 0xc0010141 +#define MSR_AMD64_LS_CFG 0xc0011020 +#define MSR_AMD64_DC_CFG 0xc0011022 +#define MSR_AMD64_BU_CFG2 0xc001102a +#define MSR_AMD64_IBSFETCHCTL 0xc0011030 +#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 +#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 +#define MSR_AMD64_IBSFETCH_REG_COUNT 3 +#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) +#define MSR_AMD64_IBSOPCTL 0xc0011033 +#define MSR_AMD64_IBSOPRIP 0xc0011034 +#define MSR_AMD64_IBSOPDATA 0xc0011035 +#define MSR_AMD64_IBSOPDATA2 0xc0011036 +#define MSR_AMD64_IBSOPDATA3 0xc0011037 +#define MSR_AMD64_IBSDCLINAD 0xc0011038 +#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 +#define MSR_AMD64_IBSOP_REG_COUNT 7 +#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) +#define MSR_AMD64_IBSCTL 0xc001103a +#define MSR_AMD64_IBSBRTARGET 0xc001103b +#define MSR_AMD64_IBSOPDATA4 0xc001103d +#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ + +/* Fam 17h MSRs */ +#define MSR_F17H_IRPERF 0xc00000e9 + +/* Fam 16h MSRs */ +#define MSR_F16H_L2I_PERF_CTL 0xc0010230 +#define MSR_F16H_L2I_PERF_CTR 0xc0010231 +#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 +#define MSR_F16H_DR2_ADDR_MASK 0xc001101a +#define MSR_F16H_DR3_ADDR_MASK 0xc001101b +#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 + +/* Fam 15h MSRs */ +#define MSR_F15H_PERF_CTL 0xc0010200 +#define MSR_F15H_PERF_CTR 0xc0010201 +#define MSR_F15H_NB_PERF_CTL 0xc0010240 +#define MSR_F15H_NB_PERF_CTR 0xc0010241 +#define MSR_F15H_PTSC 0xc0010280 +#define MSR_F15H_IC_CFG 0xc0011021 + +/* Fam 10h MSRs */ +#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 +#define FAM10H_MMIO_CONF_ENABLE (1<<0) +#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf +#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 +#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL +#define FAM10H_MMIO_CONF_BASE_SHIFT 20 +#define MSR_FAM10H_NODE_ID 0xc001100c + +/* K8 MSRs */ +#define MSR_K8_TOP_MEM1 0xc001001a +#define MSR_K8_TOP_MEM2 0xc001001d +#define MSR_K8_SYSCFG 0xc0010010 +#define MSR_K8_INT_PENDING_MSG 0xc0010055 +/* C1E active bits in int pending message */ +#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 +#define MSR_K8_TSEG_ADDR 0xc0010112 +#define MSR_K8_TSEG_MASK 0xc0010113 +#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ +#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ +#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ + +/* K7 MSRs */ +#define MSR_K7_EVNTSEL0 0xc0010000 +#define MSR_K7_PERFCTR0 0xc0010004 +#define MSR_K7_EVNTSEL1 0xc0010001 +#define MSR_K7_PERFCTR1 0xc0010005 +#define MSR_K7_EVNTSEL2 0xc0010002 +#define MSR_K7_PERFCTR2 0xc0010006 +#define MSR_K7_EVNTSEL3 0xc0010003 +#define MSR_K7_PERFCTR3 0xc0010007 +#define MSR_K7_CLK_CTL 0xc001001b +#define MSR_K7_HWCR 0xc0010015 +#define MSR_K7_FID_VID_CTL 0xc0010041 +#define MSR_K7_FID_VID_STATUS 0xc0010042 + +/* K6 MSRs */ +#define MSR_K6_WHCR 0xc0000082 +#define MSR_K6_UWCCR 0xc0000085 +#define MSR_K6_EPMR 0xc0000086 +#define MSR_K6_PSOR 0xc0000087 +#define MSR_K6_PFIR 0xc0000088 + +/* Centaur-Hauls/IDT defined MSRs. */ +#define MSR_IDT_FCR1 0x00000107 +#define MSR_IDT_FCR2 0x00000108 +#define MSR_IDT_FCR3 0x00000109 +#define MSR_IDT_FCR4 0x0000010a + +#define MSR_IDT_MCR0 0x00000110 +#define MSR_IDT_MCR1 0x00000111 +#define MSR_IDT_MCR2 0x00000112 +#define MSR_IDT_MCR3 0x00000113 +#define MSR_IDT_MCR4 0x00000114 +#define MSR_IDT_MCR5 0x00000115 +#define MSR_IDT_MCR6 0x00000116 +#define MSR_IDT_MCR7 0x00000117 +#define MSR_IDT_MCR_CTRL 0x00000120 + +/* VIA Cyrix defined MSRs*/ +#define MSR_VIA_FCR 0x00001107 +#define MSR_VIA_LONGHAUL 0x0000110a +#define MSR_VIA_RNG 0x0000110b +#define MSR_VIA_BCR2 0x00001147 + +/* Transmeta defined MSRs */ +#define MSR_TMTA_LONGRUN_CTRL 0x80868010 +#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 +#define MSR_TMTA_LRTI_READOUT 0x80868018 +#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a + +/* Intel defined MSRs. */ +#define MSR_IA32_P5_MC_ADDR 0x00000000 +#define MSR_IA32_P5_MC_TYPE 0x00000001 +#define MSR_IA32_TSC 0x00000010 +#define MSR_IA32_PLATFORM_ID 0x00000017 +#define MSR_IA32_EBL_CR_POWERON 0x0000002a +#define MSR_EBC_FREQUENCY_ID 0x0000002c +#define MSR_SMI_COUNT 0x00000034 +#define MSR_IA32_FEATURE_CONTROL 0x0000003a +#define MSR_IA32_TSC_ADJUST 0x0000003b +#define MSR_IA32_BNDCFGS 0x00000d90 + +#define MSR_IA32_XSS 0x00000da0 + +#define FEATURE_CONTROL_LOCKED (1<<0) +#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) +#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) +#define FEATURE_CONTROL_LMCE (1<<20) + +#define MSR_IA32_APICBASE 0x0000001b +#define MSR_IA32_APICBASE_BSP (1<<8) +#define MSR_IA32_APICBASE_ENABLE (1<<11) +#define MSR_IA32_APICBASE_BASE (0xfffff<<12) + +#define MSR_IA32_TSCDEADLINE 0x000006e0 + +#define MSR_IA32_UCODE_WRITE 0x00000079 +#define MSR_IA32_UCODE_REV 0x0000008b + +#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b +#define MSR_IA32_SMBASE 0x0000009e + +#define MSR_IA32_PERF_STATUS 0x00000198 +#define MSR_IA32_PERF_CTL 0x00000199 +#define INTEL_PERF_CTL_MASK 0xffff +#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 +#define MSR_AMD_PERF_STATUS 0xc0010063 +#define MSR_AMD_PERF_CTL 0xc0010062 + +#define MSR_IA32_MPERF 0x000000e7 +#define MSR_IA32_APERF 0x000000e8 + +#define MSR_IA32_THERM_CONTROL 0x0000019a +#define MSR_IA32_THERM_INTERRUPT 0x0000019b + +#define THERM_INT_HIGH_ENABLE (1 << 0) +#define THERM_INT_LOW_ENABLE (1 << 1) +#define THERM_INT_PLN_ENABLE (1 << 24) + +#define MSR_IA32_THERM_STATUS 0x0000019c + +#define THERM_STATUS_PROCHOT (1 << 0) +#define THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_THERM2_CTL 0x0000019d + +#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) + +#define MSR_IA32_MISC_ENABLE 0x000001a0 + +#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 + +#define MSR_MISC_PWR_MGMT 0x000001aa + +#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 +#define ENERGY_PERF_BIAS_PERFORMANCE 0 +#define ENERGY_PERF_BIAS_NORMAL 6 +#define ENERGY_PERF_BIAS_POWERSAVE 15 + +#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 + +#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) +#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 + +#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) +#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) +#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) + +/* Thermal Thresholds Support */ +#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) +#define THERM_SHIFT_THRESHOLD0 8 +#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) +#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) +#define THERM_SHIFT_THRESHOLD1 16 +#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) +#define THERM_STATUS_THRESHOLD0 (1 << 6) +#define THERM_LOG_THRESHOLD0 (1 << 7) +#define THERM_STATUS_THRESHOLD1 (1 << 8) +#define THERM_LOG_THRESHOLD1 (1 << 9) + +/* MISC_ENABLE bits: architectural */ +#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 +#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) +#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 +#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) +#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 +#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) +#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 +#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 +#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) + +/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ +#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 +#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) +#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 +#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) +#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 +#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) + +#define MSR_IA32_TSC_DEADLINE 0x000006E0 + +/* P4/Xeon+ specific */ +#define MSR_IA32_MCG_EAX 0x00000180 +#define MSR_IA32_MCG_EBX 0x00000181 +#define MSR_IA32_MCG_ECX 0x00000182 +#define MSR_IA32_MCG_EDX 0x00000183 +#define MSR_IA32_MCG_ESI 0x00000184 +#define MSR_IA32_MCG_EDI 0x00000185 +#define MSR_IA32_MCG_EBP 0x00000186 +#define MSR_IA32_MCG_ESP 0x00000187 +#define MSR_IA32_MCG_EFLAGS 0x00000188 +#define MSR_IA32_MCG_EIP 0x00000189 +#define MSR_IA32_MCG_RESERVED 0x0000018a + +/* Pentium IV performance counter MSRs */ +#define MSR_P4_BPU_PERFCTR0 0x00000300 +#define MSR_P4_BPU_PERFCTR1 0x00000301 +#define MSR_P4_BPU_PERFCTR2 0x00000302 +#define MSR_P4_BPU_PERFCTR3 0x00000303 +#define MSR_P4_MS_PERFCTR0 0x00000304 +#define MSR_P4_MS_PERFCTR1 0x00000305 +#define MSR_P4_MS_PERFCTR2 0x00000306 +#define MSR_P4_MS_PERFCTR3 0x00000307 +#define MSR_P4_FLAME_PERFCTR0 0x00000308 +#define MSR_P4_FLAME_PERFCTR1 0x00000309 +#define MSR_P4_FLAME_PERFCTR2 0x0000030a +#define MSR_P4_FLAME_PERFCTR3 0x0000030b +#define MSR_P4_IQ_PERFCTR0 0x0000030c +#define MSR_P4_IQ_PERFCTR1 0x0000030d +#define MSR_P4_IQ_PERFCTR2 0x0000030e +#define MSR_P4_IQ_PERFCTR3 0x0000030f +#define MSR_P4_IQ_PERFCTR4 0x00000310 +#define MSR_P4_IQ_PERFCTR5 0x00000311 +#define MSR_P4_BPU_CCCR0 0x00000360 +#define MSR_P4_BPU_CCCR1 0x00000361 +#define MSR_P4_BPU_CCCR2 0x00000362 +#define MSR_P4_BPU_CCCR3 0x00000363 +#define MSR_P4_MS_CCCR0 0x00000364 +#define MSR_P4_MS_CCCR1 0x00000365 +#define MSR_P4_MS_CCCR2 0x00000366 +#define MSR_P4_MS_CCCR3 0x00000367 +#define MSR_P4_FLAME_CCCR0 0x00000368 +#define MSR_P4_FLAME_CCCR1 0x00000369 +#define MSR_P4_FLAME_CCCR2 0x0000036a +#define MSR_P4_FLAME_CCCR3 0x0000036b +#define MSR_P4_IQ_CCCR0 0x0000036c +#define MSR_P4_IQ_CCCR1 0x0000036d +#define MSR_P4_IQ_CCCR2 0x0000036e +#define MSR_P4_IQ_CCCR3 0x0000036f +#define MSR_P4_IQ_CCCR4 0x00000370 +#define MSR_P4_IQ_CCCR5 0x00000371 +#define MSR_P4_ALF_ESCR0 0x000003ca +#define MSR_P4_ALF_ESCR1 0x000003cb +#define MSR_P4_BPU_ESCR0 0x000003b2 +#define MSR_P4_BPU_ESCR1 0x000003b3 +#define MSR_P4_BSU_ESCR0 0x000003a0 +#define MSR_P4_BSU_ESCR1 0x000003a1 +#define MSR_P4_CRU_ESCR0 0x000003b8 +#define MSR_P4_CRU_ESCR1 0x000003b9 +#define MSR_P4_CRU_ESCR2 0x000003cc +#define MSR_P4_CRU_ESCR3 0x000003cd +#define MSR_P4_CRU_ESCR4 0x000003e0 +#define MSR_P4_CRU_ESCR5 0x000003e1 +#define MSR_P4_DAC_ESCR0 0x000003a8 +#define MSR_P4_DAC_ESCR1 0x000003a9 +#define MSR_P4_FIRM_ESCR0 0x000003a4 +#define MSR_P4_FIRM_ESCR1 0x000003a5 +#define MSR_P4_FLAME_ESCR0 0x000003a6 +#define MSR_P4_FLAME_ESCR1 0x000003a7 +#define MSR_P4_FSB_ESCR0 0x000003a2 +#define MSR_P4_FSB_ESCR1 0x000003a3 +#define MSR_P4_IQ_ESCR0 0x000003ba +#define MSR_P4_IQ_ESCR1 0x000003bb +#define MSR_P4_IS_ESCR0 0x000003b4 +#define MSR_P4_IS_ESCR1 0x000003b5 +#define MSR_P4_ITLB_ESCR0 0x000003b6 +#define MSR_P4_ITLB_ESCR1 0x000003b7 +#define MSR_P4_IX_ESCR0 0x000003c8 +#define MSR_P4_IX_ESCR1 0x000003c9 +#define MSR_P4_MOB_ESCR0 0x000003aa +#define MSR_P4_MOB_ESCR1 0x000003ab +#define MSR_P4_MS_ESCR0 0x000003c0 +#define MSR_P4_MS_ESCR1 0x000003c1 +#define MSR_P4_PMH_ESCR0 0x000003ac +#define MSR_P4_PMH_ESCR1 0x000003ad +#define MSR_P4_RAT_ESCR0 0x000003bc +#define MSR_P4_RAT_ESCR1 0x000003bd +#define MSR_P4_SAAT_ESCR0 0x000003ae +#define MSR_P4_SAAT_ESCR1 0x000003af +#define MSR_P4_SSU_ESCR0 0x000003be +#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ + +#define MSR_P4_TBPU_ESCR0 0x000003c2 +#define MSR_P4_TBPU_ESCR1 0x000003c3 +#define MSR_P4_TC_ESCR0 0x000003c4 +#define MSR_P4_TC_ESCR1 0x000003c5 +#define MSR_P4_U2L_ESCR0 0x000003b0 +#define MSR_P4_U2L_ESCR1 0x000003b1 + +#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 + +/* Intel Core-based CPU performance counters */ +#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 +#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a +#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b +#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d +#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e +#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f +#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 + +/* Geode defined MSRs */ +#define MSR_GEODE_BUSCONT_CONF0 0x00001900 + +/* Intel VT MSRs */ +#define MSR_IA32_VMX_BASIC 0x00000480 +#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 +#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 +#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 +#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 +#define MSR_IA32_VMX_MISC 0x00000485 +#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 +#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 +#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 +#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 +#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a +#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b +#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c +#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d +#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e +#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f +#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 +#define MSR_IA32_VMX_VMFUNC 0x00000491 + +/* VMX_BASIC bits and bitmasks */ +#define VMX_BASIC_VMCS_SIZE_SHIFT 32 +#define VMX_BASIC_TRUE_CTLS (1ULL << 55) +#define VMX_BASIC_64 0x0001000000000000LLU +#define VMX_BASIC_MEM_TYPE_SHIFT 50 +#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU +#define VMX_BASIC_MEM_TYPE_WB 6LLU +#define VMX_BASIC_INOUT 0x0040000000000000LLU + +/* MSR_IA32_VMX_MISC bits */ +#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) +#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F +/* AMD-V MSRs */ + +#define MSR_VM_CR 0xc0010114 +#define MSR_VM_IGNNE 0xc0010115 +#define MSR_VM_HSAVE_PA 0xc0010117 + +#endif /* _UAPI_ASM_X86_MSR_INDEX_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v2 4/7] x86: put msr-index.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (5 preceding siblings ...) (?) @ 2017-01-06 12:14 ` Borislav Petkov -1 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-06 12:14 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa On Fri, Jan 06, 2017 at 10:43:56AM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. It should rather not be exported - please remove it from arch/x86/include/uapi/asm/Kbuild instead. Thanks. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 4/7] x86: put msr-index.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (6 preceding siblings ...) (?) @ 2017-01-06 12:14 ` Borislav Petkov -1 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-06 12:14 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm On Fri, Jan 06, 2017 at 10:43:56AM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. It should rather not be exported - please remove it from arch/x86/include/uapi/asm/Kbuild instead. Thanks. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 4/7] x86: put msr-index.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (5 preceding siblings ...) (?) @ 2017-01-06 12:14 ` Borislav Petkov -1 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-06 12:14 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa On Fri, Jan 06, 2017 at 10:43:56AM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. It should rather not be exported - please remove it from arch/x86/include/uapi/asm/Kbuild instead. Thanks. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 12:14 ` Borislav Petkov 0 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-06 12:14 UTC (permalink / raw) To: openrisc On Fri, Jan 06, 2017 at 10:43:56AM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. It should rather not be exported - please remove it from arch/x86/include/uapi/asm/Kbuild instead. Thanks. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 12:14 ` Borislav Petkov 0 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-06 12:14 UTC (permalink / raw) To: linux-arm-kernel On Fri, Jan 06, 2017 at 10:43:56AM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. It should rather not be exported - please remove it from arch/x86/include/uapi/asm/Kbuild instead. Thanks. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 12:14 ` Borislav Petkov 0 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-06 12:14 UTC (permalink / raw) To: linux-snps-arc On Fri, Jan 06, 2017@10:43:56AM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. It should rather not be exported - please remove it from arch/x86/include/uapi/asm/Kbuild instead. Thanks. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 12:14 ` Borislav Petkov 0 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-06 12:14 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem On Fri, Jan 06, 2017 at 10:43:56AM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. It should rather not be exported - please remove it from arch/x86/include/uapi/asm/Kbuild instead. Thanks. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 12:14 ` Borislav Petkov 0 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-06 12:14 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem On Fri, Jan 06, 2017 at 10:43:56AM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. It should rather not be exported - please remove it from arch/x86/include/uapi/asm/Kbuild instead. Thanks. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 12:14 ` Borislav Petkov 0 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-06 12:14 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-ar On Fri, Jan 06, 2017 at 10:43:56AM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. It should rather not be exported - please remove it from arch/x86/include/uapi/asm/Kbuild instead. Thanks. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 12:14 ` Borislav Petkov 0 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-06 12:14 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa On Fri, Jan 06, 2017 at 10:43:56AM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. It should rather not be exported - please remove it from arch/x86/include/uapi/asm/Kbuild instead. Thanks. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 4/7] x86: put msr-index.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (8 preceding siblings ...) (?) @ 2017-01-06 20:50 ` Andy Shevchenko -1 siblings, 0 replies; 554+ messages in thread From: Andy Shevchenko @ 2017-01-06 20:50 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, ALSA Development Mailing List, linux-ia64, Linux Documentation List, David Airlie, linux-fbdev, dri-devel, open list:MEMORY TECHNOLOGY..., sparclinux, Linux-Arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, Linux-SH, coreteam, fcoe-devel, xen-devel, linux-snps-arc, Linux Media Mailing List, uclinux-h8-devel, linux-xtensa, Arnd Bergmann, linux-kbuild On Fri, Jan 6, 2017 at 11:43 AM, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. Just hint for the future: -M (move) -C (copy) -D (delete) [though this is NOT for applying] -- With Best Regards, Andy Shevchenko _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 4/7] x86: put msr-index.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (6 preceding siblings ...) (?) @ 2017-01-06 20:50 ` Andy Shevchenko -1 siblings, 0 replies; 554+ messages in thread From: Andy Shevchenko @ 2017-01-06 20:50 UTC (permalink / raw) To: Nicolas Dichtel Cc: Arnd Bergmann, mmarek, linux-kbuild, Linux Documentation List, linux-kernel, linux-alpha, linux-snps-arc, linux-arm Mailing List, adi-buildroot-devel, linux-c6x-dev, Cris, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, LINUX On Fri, Jan 6, 2017 at 11:43 AM, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. Just hint for the future: -M (move) -C (copy) -D (delete) [though this is NOT for applying] -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 20:50 ` Andy Shevchenko 0 siblings, 0 replies; 554+ messages in thread From: Andy Shevchenko @ 2017-01-06 20:50 UTC (permalink / raw) To: openrisc On Fri, Jan 6, 2017 at 11:43 AM, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. Just hint for the future: -M (move) -C (copy) -D (delete) [though this is NOT for applying] -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 20:50 ` Andy Shevchenko 0 siblings, 0 replies; 554+ messages in thread From: Andy Shevchenko @ 2017-01-06 20:50 UTC (permalink / raw) To: linux-arm-kernel On Fri, Jan 6, 2017 at 11:43 AM, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. Just hint for the future: -M (move) -C (copy) -D (delete) [though this is NOT for applying] -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 20:50 ` Andy Shevchenko 0 siblings, 0 replies; 554+ messages in thread From: Andy Shevchenko @ 2017-01-06 20:50 UTC (permalink / raw) To: linux-snps-arc On Fri, Jan 6, 2017 at 11:43 AM, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. Just hint for the future: -M (move) -C (copy) -D (delete) [though this is NOT for applying] -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 20:50 ` Andy Shevchenko 0 siblings, 0 replies; 554+ messages in thread From: Andy Shevchenko @ 2017-01-06 20:50 UTC (permalink / raw) To: Nicolas Dichtel Cc: Arnd Bergmann, mmarek, linux-kbuild, Linux Documentation List, linux-kernel, linux-alpha, linux-snps-arc, linux-arm Mailing List, adi-buildroot-devel, linux-c6x-dev, Cris, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, open list:LINUX FOR POWERPC PA SEMI PWRFICIENT, linux-s390, Linux-SH, sparclinux, linux-xtensa, Linux-Arch, dri-devel, netdev, Linux Media Mailing List, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, open list:MEMORY TECHNOLOGY..., linux-rdma, fcoe-devel, ALSA Development Mailing List, linux-fbdev, xen-devel, David Airlie, David S. Miller On Fri, Jan 6, 2017 at 11:43 AM, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. Just hint for the future: -M (move) -C (copy) -D (delete) [though this is NOT for applying] -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 20:50 ` Andy Shevchenko 0 siblings, 0 replies; 554+ messages in thread From: Andy Shevchenko @ 2017-01-06 20:50 UTC (permalink / raw) To: Nicolas Dichtel Cc: Arnd Bergmann, mmarek, linux-kbuild, Linux Documentation List, linux-kernel, linux-alpha, linux-snps-arc, linux-arm Mailing List, adi-buildroot-devel, linux-c6x-dev, Cris, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, open list:LINUX FOR POWERPC PA SEMI PWRFICIENT, linux-s390, Linux-SH, sparclinux, linux-xtensa, Linux-Arch, dri-devel, netdev, Linux Media Mailing List, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, open list:MEMORY TECHNOLOGY..., linux-rdma, fcoe-devel, ALSA Development Mailing List, linux-fbdev, xen-devel, David Airlie, David S. Miller On Fri, Jan 6, 2017 at 11:43 AM, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. Just hint for the future: -M (move) -C (copy) -D (delete) [though this is NOT for applying] -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 20:50 ` Andy Shevchenko 0 siblings, 0 replies; 554+ messages in thread From: Andy Shevchenko @ 2017-01-06 20:50 UTC (permalink / raw) To: Nicolas Dichtel Cc: Arnd Bergmann, mmarek, linux-kbuild, Linux Documentation List, linux-kernel, linux-alpha, linux-snps-arc, linux-arm Mailing List, adi-buildroot-devel, linux-c6x-dev, Cris, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, open list:LINUX FOR POWERPC PA SEMI PWRFICIENT, linux-s390, Linux-SH, sparclinux, linux-xtensa, Linux-Arch, dri-devel, netdev, Linux Media Mailing List, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, open list:MEMORY TECHNOLOGY..., linux-rdma, fcoe-devel, ALSA Development Mailing List, linux-fbdev, xen-devel, David Airlie, David S. Miller On Fri, Jan 6, 2017 at 11:43 AM, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. Just hint for the future: -M (move) -C (copy) -D (delete) [though this is NOT for applying] -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 20:50 ` Andy Shevchenko 0 siblings, 0 replies; 554+ messages in thread From: Andy Shevchenko @ 2017-01-06 20:50 UTC (permalink / raw) To: Nicolas Dichtel Cc: Arnd Bergmann, mmarek, linux-kbuild, Linux Documentation List, linux-kernel, linux-alpha, linux-snps-arc, linux-arm Mailing List, adi-buildroot-devel, linux-c6x-dev, Cris, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, open list:LINUX FOR POWERPC PA SEMI PWRFICIENT, linux-s390, Linux-SH, sparclinux, linux-xtensa, Linux-Arch, dri-devel, netdev, Linux Media Mailing List, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, open list:MEMORY TECHNOLOGY..., linux-rdma, fcoe-devel, ALSA Development Mailing List, linux-fbdev, xen-devel, David Airlie, David S. Miller On Fri, Jan 6, 2017 at 11:43 AM, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. Just hint for the future: -M (move) -C (copy) -D (delete) [though this is NOT for applying] -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 4/7] x86: put msr-index.h in uapi @ 2017-01-06 20:50 ` Andy Shevchenko 0 siblings, 0 replies; 554+ messages in thread From: Andy Shevchenko @ 2017-01-06 20:50 UTC (permalink / raw) To: Nicolas Dichtel Cc: Arnd Bergmann, mmarek, linux-kbuild, Linux Documentation List, linux-kernel, linux-alpha, linux-snps-arc, linux-arm Mailing List, adi-buildroot-devel, linux-c6x-dev, Cris, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, LINUX On Fri, Jan 6, 2017 at 11:43 AM, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. Just hint for the future: -M (move) -C (copy) -D (delete) [though this is NOT for applying] -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 4/7] x86: put msr-index.h in uapi 2017-01-06 9:43 ` Nicolas Dichtel ` (14 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/x86/include/asm/msr-index.h | 694 +-------------------------------- arch/x86/include/uapi/asm/msr-index.h | 698 ++++++++++++++++++++++++++++++++++ 2 files changed, 699 insertions(+), 693 deletions(-) create mode 100644 arch/x86/include/uapi/asm/msr-index.h diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 710273c617b8..1baa0628da74 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -1,698 +1,6 @@ #ifndef _ASM_X86_MSR_INDEX_H #define _ASM_X86_MSR_INDEX_H -/* - * CPU model specific register (MSR) numbers. - * - * Do not add new entries to this file unless the definitions are shared - * between multiple compilation units. - */ - -/* x86-64 specific MSRs */ -#define MSR_EFER 0xc0000080 /* extended feature register */ -#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ -#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ -#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ -#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ -#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ -#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ -#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ -#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ - -/* EFER bits: */ -#define _EFER_SCE 0 /* SYSCALL/SYSRET */ -#define _EFER_LME 8 /* Long mode enable */ -#define _EFER_LMA 10 /* Long mode active (read-only) */ -#define _EFER_NX 11 /* No execute enable */ -#define _EFER_SVME 12 /* Enable virtualization */ -#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ -#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ - -#define EFER_SCE (1<<_EFER_SCE) -#define EFER_LME (1<<_EFER_LME) -#define EFER_LMA (1<<_EFER_LMA) -#define EFER_NX (1<<_EFER_NX) -#define EFER_SVME (1<<_EFER_SVME) -#define EFER_LMSLE (1<<_EFER_LMSLE) -#define EFER_FFXSR (1<<_EFER_FFXSR) - -/* Intel MSRs. Some also available on other CPUs */ - -#define MSR_PPIN_CTL 0x0000004e -#define MSR_PPIN 0x0000004f - -#define MSR_IA32_PERFCTR0 0x000000c1 -#define MSR_IA32_PERFCTR1 0x000000c2 -#define MSR_FSB_FREQ 0x000000cd -#define MSR_PLATFORM_INFO 0x000000ce - -#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 -#define NHM_C3_AUTO_DEMOTE (1UL << 25) -#define NHM_C1_AUTO_DEMOTE (1UL << 26) -#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) -#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) -#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) - -#define MSR_MTRRcap 0x000000fe -#define MSR_IA32_BBL_CR_CTL 0x00000119 -#define MSR_IA32_BBL_CR_CTL3 0x0000011e - -#define MSR_IA32_SYSENTER_CS 0x00000174 -#define MSR_IA32_SYSENTER_ESP 0x00000175 -#define MSR_IA32_SYSENTER_EIP 0x00000176 - -#define MSR_IA32_MCG_CAP 0x00000179 -#define MSR_IA32_MCG_STATUS 0x0000017a -#define MSR_IA32_MCG_CTL 0x0000017b -#define MSR_IA32_MCG_EXT_CTL 0x000004d0 - -#define MSR_OFFCORE_RSP_0 0x000001a6 -#define MSR_OFFCORE_RSP_1 0x000001a7 -#define MSR_TURBO_RATIO_LIMIT 0x000001ad -#define MSR_TURBO_RATIO_LIMIT1 0x000001ae -#define MSR_TURBO_RATIO_LIMIT2 0x000001af - -#define MSR_LBR_SELECT 0x000001c8 -#define MSR_LBR_TOS 0x000001c9 -#define MSR_LBR_NHM_FROM 0x00000680 -#define MSR_LBR_NHM_TO 0x000006c0 -#define MSR_LBR_CORE_FROM 0x00000040 -#define MSR_LBR_CORE_TO 0x00000060 - -#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ -#define LBR_INFO_MISPRED BIT_ULL(63) -#define LBR_INFO_IN_TX BIT_ULL(62) -#define LBR_INFO_ABORT BIT_ULL(61) -#define LBR_INFO_CYCLES 0xffff - -#define MSR_IA32_PEBS_ENABLE 0x000003f1 -#define MSR_IA32_DS_AREA 0x00000600 -#define MSR_IA32_PERF_CAPABILITIES 0x00000345 -#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 - -#define MSR_IA32_RTIT_CTL 0x00000570 -#define MSR_IA32_RTIT_STATUS 0x00000571 -#define MSR_IA32_RTIT_ADDR0_A 0x00000580 -#define MSR_IA32_RTIT_ADDR0_B 0x00000581 -#define MSR_IA32_RTIT_ADDR1_A 0x00000582 -#define MSR_IA32_RTIT_ADDR1_B 0x00000583 -#define MSR_IA32_RTIT_ADDR2_A 0x00000584 -#define MSR_IA32_RTIT_ADDR2_B 0x00000585 -#define MSR_IA32_RTIT_ADDR3_A 0x00000586 -#define MSR_IA32_RTIT_ADDR3_B 0x00000587 -#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 -#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 -#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 - -#define MSR_MTRRfix64K_00000 0x00000250 -#define MSR_MTRRfix16K_80000 0x00000258 -#define MSR_MTRRfix16K_A0000 0x00000259 -#define MSR_MTRRfix4K_C0000 0x00000268 -#define MSR_MTRRfix4K_C8000 0x00000269 -#define MSR_MTRRfix4K_D0000 0x0000026a -#define MSR_MTRRfix4K_D8000 0x0000026b -#define MSR_MTRRfix4K_E0000 0x0000026c -#define MSR_MTRRfix4K_E8000 0x0000026d -#define MSR_MTRRfix4K_F0000 0x0000026e -#define MSR_MTRRfix4K_F8000 0x0000026f -#define MSR_MTRRdefType 0x000002ff - -#define MSR_IA32_CR_PAT 0x00000277 - -#define MSR_IA32_DEBUGCTLMSR 0x000001d9 -#define MSR_IA32_LASTBRANCHFROMIP 0x000001db -#define MSR_IA32_LASTBRANCHTOIP 0x000001dc -#define MSR_IA32_LASTINTFROMIP 0x000001dd -#define MSR_IA32_LASTINTTOIP 0x000001de - -/* DEBUGCTLMSR bits (others vary by model): */ -#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ -#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ -#define DEBUGCTLMSR_TR (1UL << 6) -#define DEBUGCTLMSR_BTS (1UL << 7) -#define DEBUGCTLMSR_BTINT (1UL << 8) -#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) -#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) -#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) - -#define MSR_PEBS_FRONTEND 0x000003f7 - -#define MSR_IA32_POWER_CTL 0x000001fc - -#define MSR_IA32_MC0_CTL 0x00000400 -#define MSR_IA32_MC0_STATUS 0x00000401 -#define MSR_IA32_MC0_ADDR 0x00000402 -#define MSR_IA32_MC0_MISC 0x00000403 - -/* C-state Residency Counters */ -#define MSR_PKG_C3_RESIDENCY 0x000003f8 -#define MSR_PKG_C6_RESIDENCY 0x000003f9 -#define MSR_PKG_C7_RESIDENCY 0x000003fa -#define MSR_CORE_C3_RESIDENCY 0x000003fc -#define MSR_CORE_C6_RESIDENCY 0x000003fd -#define MSR_CORE_C7_RESIDENCY 0x000003fe -#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff -#define MSR_PKG_C2_RESIDENCY 0x0000060d -#define MSR_PKG_C8_RESIDENCY 0x00000630 -#define MSR_PKG_C9_RESIDENCY 0x00000631 -#define MSR_PKG_C10_RESIDENCY 0x00000632 - -/* Interrupt Response Limit */ -#define MSR_PKGC3_IRTL 0x0000060a -#define MSR_PKGC6_IRTL 0x0000060b -#define MSR_PKGC7_IRTL 0x0000060c -#define MSR_PKGC8_IRTL 0x00000633 -#define MSR_PKGC9_IRTL 0x00000634 -#define MSR_PKGC10_IRTL 0x00000635 - -/* Run Time Average Power Limiting (RAPL) Interface */ - -#define MSR_RAPL_POWER_UNIT 0x00000606 - -#define MSR_PKG_POWER_LIMIT 0x00000610 -#define MSR_PKG_ENERGY_STATUS 0x00000611 -#define MSR_PKG_PERF_STATUS 0x00000613 -#define MSR_PKG_POWER_INFO 0x00000614 - -#define MSR_DRAM_POWER_LIMIT 0x00000618 -#define MSR_DRAM_ENERGY_STATUS 0x00000619 -#define MSR_DRAM_PERF_STATUS 0x0000061b -#define MSR_DRAM_POWER_INFO 0x0000061c - -#define MSR_PP0_POWER_LIMIT 0x00000638 -#define MSR_PP0_ENERGY_STATUS 0x00000639 -#define MSR_PP0_POLICY 0x0000063a -#define MSR_PP0_PERF_STATUS 0x0000063b - -#define MSR_PP1_POWER_LIMIT 0x00000640 -#define MSR_PP1_ENERGY_STATUS 0x00000641 -#define MSR_PP1_POLICY 0x00000642 - -/* Config TDP MSRs */ -#define MSR_CONFIG_TDP_NOMINAL 0x00000648 -#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 -#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A -#define MSR_CONFIG_TDP_CONTROL 0x0000064B -#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C - -#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D - -#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 -#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 -#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A -#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B - -#define MSR_CORE_C1_RES 0x00000660 - -#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 -#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 - -#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 -#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 -#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 - -/* Hardware P state interface */ -#define MSR_PPERF 0x0000064e -#define MSR_PERF_LIMIT_REASONS 0x0000064f -#define MSR_PM_ENABLE 0x00000770 -#define MSR_HWP_CAPABILITIES 0x00000771 -#define MSR_HWP_REQUEST_PKG 0x00000772 -#define MSR_HWP_INTERRUPT 0x00000773 -#define MSR_HWP_REQUEST 0x00000774 -#define MSR_HWP_STATUS 0x00000777 - -/* CPUID.6.EAX */ -#define HWP_BASE_BIT (1<<7) -#define HWP_NOTIFICATIONS_BIT (1<<8) -#define HWP_ACTIVITY_WINDOW_BIT (1<<9) -#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) -#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) - -/* IA32_HWP_CAPABILITIES */ -#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) -#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) -#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) -#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) - -/* IA32_HWP_REQUEST */ -#define HWP_MIN_PERF(x) (x & 0xff) -#define HWP_MAX_PERF(x) ((x & 0xff) << 8) -#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) -#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) -#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) -#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) - -/* IA32_HWP_STATUS */ -#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) - -/* IA32_HWP_INTERRUPT */ -#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) - -#define MSR_AMD64_MC0_MASK 0xc0010044 - -#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) -#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) -#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) -#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) - -#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) - -/* These are consecutive and not in the normal 4er MCE bank block */ -#define MSR_IA32_MC0_CTL2 0x00000280 -#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) - -#define MSR_P6_PERFCTR0 0x000000c1 -#define MSR_P6_PERFCTR1 0x000000c2 -#define MSR_P6_EVNTSEL0 0x00000186 -#define MSR_P6_EVNTSEL1 0x00000187 - -#define MSR_KNC_PERFCTR0 0x00000020 -#define MSR_KNC_PERFCTR1 0x00000021 -#define MSR_KNC_EVNTSEL0 0x00000028 -#define MSR_KNC_EVNTSEL1 0x00000029 - -/* Alternative perfctr range with full access. */ -#define MSR_IA32_PMC0 0x000004c1 - -/* AMD64 MSRs. Not complete. See the architecture manual for a more - complete list. */ - -#define MSR_AMD64_PATCH_LEVEL 0x0000008b -#define MSR_AMD64_TSC_RATIO 0xc0000104 -#define MSR_AMD64_NB_CFG 0xc001001f -#define MSR_AMD64_PATCH_LOADER 0xc0010020 -#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 -#define MSR_AMD64_OSVW_STATUS 0xc0010141 -#define MSR_AMD64_LS_CFG 0xc0011020 -#define MSR_AMD64_DC_CFG 0xc0011022 -#define MSR_AMD64_BU_CFG2 0xc001102a -#define MSR_AMD64_IBSFETCHCTL 0xc0011030 -#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 -#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 -#define MSR_AMD64_IBSFETCH_REG_COUNT 3 -#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) -#define MSR_AMD64_IBSOPCTL 0xc0011033 -#define MSR_AMD64_IBSOPRIP 0xc0011034 -#define MSR_AMD64_IBSOPDATA 0xc0011035 -#define MSR_AMD64_IBSOPDATA2 0xc0011036 -#define MSR_AMD64_IBSOPDATA3 0xc0011037 -#define MSR_AMD64_IBSDCLINAD 0xc0011038 -#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 -#define MSR_AMD64_IBSOP_REG_COUNT 7 -#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) -#define MSR_AMD64_IBSCTL 0xc001103a -#define MSR_AMD64_IBSBRTARGET 0xc001103b -#define MSR_AMD64_IBSOPDATA4 0xc001103d -#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ - -/* Fam 17h MSRs */ -#define MSR_F17H_IRPERF 0xc00000e9 - -/* Fam 16h MSRs */ -#define MSR_F16H_L2I_PERF_CTL 0xc0010230 -#define MSR_F16H_L2I_PERF_CTR 0xc0010231 -#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 -#define MSR_F16H_DR2_ADDR_MASK 0xc001101a -#define MSR_F16H_DR3_ADDR_MASK 0xc001101b -#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 - -/* Fam 15h MSRs */ -#define MSR_F15H_PERF_CTL 0xc0010200 -#define MSR_F15H_PERF_CTR 0xc0010201 -#define MSR_F15H_NB_PERF_CTL 0xc0010240 -#define MSR_F15H_NB_PERF_CTR 0xc0010241 -#define MSR_F15H_PTSC 0xc0010280 -#define MSR_F15H_IC_CFG 0xc0011021 - -/* Fam 10h MSRs */ -#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 -#define FAM10H_MMIO_CONF_ENABLE (1<<0) -#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf -#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 -#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL -#define FAM10H_MMIO_CONF_BASE_SHIFT 20 -#define MSR_FAM10H_NODE_ID 0xc001100c - -/* K8 MSRs */ -#define MSR_K8_TOP_MEM1 0xc001001a -#define MSR_K8_TOP_MEM2 0xc001001d -#define MSR_K8_SYSCFG 0xc0010010 -#define MSR_K8_INT_PENDING_MSG 0xc0010055 -/* C1E active bits in int pending message */ -#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 -#define MSR_K8_TSEG_ADDR 0xc0010112 -#define MSR_K8_TSEG_MASK 0xc0010113 -#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ -#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ -#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ - -/* K7 MSRs */ -#define MSR_K7_EVNTSEL0 0xc0010000 -#define MSR_K7_PERFCTR0 0xc0010004 -#define MSR_K7_EVNTSEL1 0xc0010001 -#define MSR_K7_PERFCTR1 0xc0010005 -#define MSR_K7_EVNTSEL2 0xc0010002 -#define MSR_K7_PERFCTR2 0xc0010006 -#define MSR_K7_EVNTSEL3 0xc0010003 -#define MSR_K7_PERFCTR3 0xc0010007 -#define MSR_K7_CLK_CTL 0xc001001b -#define MSR_K7_HWCR 0xc0010015 -#define MSR_K7_FID_VID_CTL 0xc0010041 -#define MSR_K7_FID_VID_STATUS 0xc0010042 - -/* K6 MSRs */ -#define MSR_K6_WHCR 0xc0000082 -#define MSR_K6_UWCCR 0xc0000085 -#define MSR_K6_EPMR 0xc0000086 -#define MSR_K6_PSOR 0xc0000087 -#define MSR_K6_PFIR 0xc0000088 - -/* Centaur-Hauls/IDT defined MSRs. */ -#define MSR_IDT_FCR1 0x00000107 -#define MSR_IDT_FCR2 0x00000108 -#define MSR_IDT_FCR3 0x00000109 -#define MSR_IDT_FCR4 0x0000010a - -#define MSR_IDT_MCR0 0x00000110 -#define MSR_IDT_MCR1 0x00000111 -#define MSR_IDT_MCR2 0x00000112 -#define MSR_IDT_MCR3 0x00000113 -#define MSR_IDT_MCR4 0x00000114 -#define MSR_IDT_MCR5 0x00000115 -#define MSR_IDT_MCR6 0x00000116 -#define MSR_IDT_MCR7 0x00000117 -#define MSR_IDT_MCR_CTRL 0x00000120 - -/* VIA Cyrix defined MSRs*/ -#define MSR_VIA_FCR 0x00001107 -#define MSR_VIA_LONGHAUL 0x0000110a -#define MSR_VIA_RNG 0x0000110b -#define MSR_VIA_BCR2 0x00001147 - -/* Transmeta defined MSRs */ -#define MSR_TMTA_LONGRUN_CTRL 0x80868010 -#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 -#define MSR_TMTA_LRTI_READOUT 0x80868018 -#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a - -/* Intel defined MSRs. */ -#define MSR_IA32_P5_MC_ADDR 0x00000000 -#define MSR_IA32_P5_MC_TYPE 0x00000001 -#define MSR_IA32_TSC 0x00000010 -#define MSR_IA32_PLATFORM_ID 0x00000017 -#define MSR_IA32_EBL_CR_POWERON 0x0000002a -#define MSR_EBC_FREQUENCY_ID 0x0000002c -#define MSR_SMI_COUNT 0x00000034 -#define MSR_IA32_FEATURE_CONTROL 0x0000003a -#define MSR_IA32_TSC_ADJUST 0x0000003b -#define MSR_IA32_BNDCFGS 0x00000d90 - -#define MSR_IA32_XSS 0x00000da0 - -#define FEATURE_CONTROL_LOCKED (1<<0) -#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) -#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) -#define FEATURE_CONTROL_LMCE (1<<20) - -#define MSR_IA32_APICBASE 0x0000001b -#define MSR_IA32_APICBASE_BSP (1<<8) -#define MSR_IA32_APICBASE_ENABLE (1<<11) -#define MSR_IA32_APICBASE_BASE (0xfffff<<12) - -#define MSR_IA32_TSCDEADLINE 0x000006e0 - -#define MSR_IA32_UCODE_WRITE 0x00000079 -#define MSR_IA32_UCODE_REV 0x0000008b - -#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b -#define MSR_IA32_SMBASE 0x0000009e - -#define MSR_IA32_PERF_STATUS 0x00000198 -#define MSR_IA32_PERF_CTL 0x00000199 -#define INTEL_PERF_CTL_MASK 0xffff -#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 -#define MSR_AMD_PERF_STATUS 0xc0010063 -#define MSR_AMD_PERF_CTL 0xc0010062 - -#define MSR_IA32_MPERF 0x000000e7 -#define MSR_IA32_APERF 0x000000e8 - -#define MSR_IA32_THERM_CONTROL 0x0000019a -#define MSR_IA32_THERM_INTERRUPT 0x0000019b - -#define THERM_INT_HIGH_ENABLE (1 << 0) -#define THERM_INT_LOW_ENABLE (1 << 1) -#define THERM_INT_PLN_ENABLE (1 << 24) - -#define MSR_IA32_THERM_STATUS 0x0000019c - -#define THERM_STATUS_PROCHOT (1 << 0) -#define THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_THERM2_CTL 0x0000019d - -#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) - -#define MSR_IA32_MISC_ENABLE 0x000001a0 - -#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 - -#define MSR_MISC_PWR_MGMT 0x000001aa - -#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 -#define ENERGY_PERF_BIAS_PERFORMANCE 0 -#define ENERGY_PERF_BIAS_NORMAL 6 -#define ENERGY_PERF_BIAS_POWERSAVE 15 - -#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 - -#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) -#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 - -#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) -#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) -#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) - -/* Thermal Thresholds Support */ -#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) -#define THERM_SHIFT_THRESHOLD0 8 -#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) -#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) -#define THERM_SHIFT_THRESHOLD1 16 -#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) -#define THERM_STATUS_THRESHOLD0 (1 << 6) -#define THERM_LOG_THRESHOLD0 (1 << 7) -#define THERM_STATUS_THRESHOLD1 (1 << 8) -#define THERM_LOG_THRESHOLD1 (1 << 9) - -/* MISC_ENABLE bits: architectural */ -#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 -#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) -#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 -#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) -#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 -#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) -#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 -#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 -#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) - -/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ -#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 -#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) -#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 -#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) -#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 -#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) - -#define MSR_IA32_TSC_DEADLINE 0x000006E0 - -/* P4/Xeon+ specific */ -#define MSR_IA32_MCG_EAX 0x00000180 -#define MSR_IA32_MCG_EBX 0x00000181 -#define MSR_IA32_MCG_ECX 0x00000182 -#define MSR_IA32_MCG_EDX 0x00000183 -#define MSR_IA32_MCG_ESI 0x00000184 -#define MSR_IA32_MCG_EDI 0x00000185 -#define MSR_IA32_MCG_EBP 0x00000186 -#define MSR_IA32_MCG_ESP 0x00000187 -#define MSR_IA32_MCG_EFLAGS 0x00000188 -#define MSR_IA32_MCG_EIP 0x00000189 -#define MSR_IA32_MCG_RESERVED 0x0000018a - -/* Pentium IV performance counter MSRs */ -#define MSR_P4_BPU_PERFCTR0 0x00000300 -#define MSR_P4_BPU_PERFCTR1 0x00000301 -#define MSR_P4_BPU_PERFCTR2 0x00000302 -#define MSR_P4_BPU_PERFCTR3 0x00000303 -#define MSR_P4_MS_PERFCTR0 0x00000304 -#define MSR_P4_MS_PERFCTR1 0x00000305 -#define MSR_P4_MS_PERFCTR2 0x00000306 -#define MSR_P4_MS_PERFCTR3 0x00000307 -#define MSR_P4_FLAME_PERFCTR0 0x00000308 -#define MSR_P4_FLAME_PERFCTR1 0x00000309 -#define MSR_P4_FLAME_PERFCTR2 0x0000030a -#define MSR_P4_FLAME_PERFCTR3 0x0000030b -#define MSR_P4_IQ_PERFCTR0 0x0000030c -#define MSR_P4_IQ_PERFCTR1 0x0000030d -#define MSR_P4_IQ_PERFCTR2 0x0000030e -#define MSR_P4_IQ_PERFCTR3 0x0000030f -#define MSR_P4_IQ_PERFCTR4 0x00000310 -#define MSR_P4_IQ_PERFCTR5 0x00000311 -#define MSR_P4_BPU_CCCR0 0x00000360 -#define MSR_P4_BPU_CCCR1 0x00000361 -#define MSR_P4_BPU_CCCR2 0x00000362 -#define MSR_P4_BPU_CCCR3 0x00000363 -#define MSR_P4_MS_CCCR0 0x00000364 -#define MSR_P4_MS_CCCR1 0x00000365 -#define MSR_P4_MS_CCCR2 0x00000366 -#define MSR_P4_MS_CCCR3 0x00000367 -#define MSR_P4_FLAME_CCCR0 0x00000368 -#define MSR_P4_FLAME_CCCR1 0x00000369 -#define MSR_P4_FLAME_CCCR2 0x0000036a -#define MSR_P4_FLAME_CCCR3 0x0000036b -#define MSR_P4_IQ_CCCR0 0x0000036c -#define MSR_P4_IQ_CCCR1 0x0000036d -#define MSR_P4_IQ_CCCR2 0x0000036e -#define MSR_P4_IQ_CCCR3 0x0000036f -#define MSR_P4_IQ_CCCR4 0x00000370 -#define MSR_P4_IQ_CCCR5 0x00000371 -#define MSR_P4_ALF_ESCR0 0x000003ca -#define MSR_P4_ALF_ESCR1 0x000003cb -#define MSR_P4_BPU_ESCR0 0x000003b2 -#define MSR_P4_BPU_ESCR1 0x000003b3 -#define MSR_P4_BSU_ESCR0 0x000003a0 -#define MSR_P4_BSU_ESCR1 0x000003a1 -#define MSR_P4_CRU_ESCR0 0x000003b8 -#define MSR_P4_CRU_ESCR1 0x000003b9 -#define MSR_P4_CRU_ESCR2 0x000003cc -#define MSR_P4_CRU_ESCR3 0x000003cd -#define MSR_P4_CRU_ESCR4 0x000003e0 -#define MSR_P4_CRU_ESCR5 0x000003e1 -#define MSR_P4_DAC_ESCR0 0x000003a8 -#define MSR_P4_DAC_ESCR1 0x000003a9 -#define MSR_P4_FIRM_ESCR0 0x000003a4 -#define MSR_P4_FIRM_ESCR1 0x000003a5 -#define MSR_P4_FLAME_ESCR0 0x000003a6 -#define MSR_P4_FLAME_ESCR1 0x000003a7 -#define MSR_P4_FSB_ESCR0 0x000003a2 -#define MSR_P4_FSB_ESCR1 0x000003a3 -#define MSR_P4_IQ_ESCR0 0x000003ba -#define MSR_P4_IQ_ESCR1 0x000003bb -#define MSR_P4_IS_ESCR0 0x000003b4 -#define MSR_P4_IS_ESCR1 0x000003b5 -#define MSR_P4_ITLB_ESCR0 0x000003b6 -#define MSR_P4_ITLB_ESCR1 0x000003b7 -#define MSR_P4_IX_ESCR0 0x000003c8 -#define MSR_P4_IX_ESCR1 0x000003c9 -#define MSR_P4_MOB_ESCR0 0x000003aa -#define MSR_P4_MOB_ESCR1 0x000003ab -#define MSR_P4_MS_ESCR0 0x000003c0 -#define MSR_P4_MS_ESCR1 0x000003c1 -#define MSR_P4_PMH_ESCR0 0x000003ac -#define MSR_P4_PMH_ESCR1 0x000003ad -#define MSR_P4_RAT_ESCR0 0x000003bc -#define MSR_P4_RAT_ESCR1 0x000003bd -#define MSR_P4_SAAT_ESCR0 0x000003ae -#define MSR_P4_SAAT_ESCR1 0x000003af -#define MSR_P4_SSU_ESCR0 0x000003be -#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ - -#define MSR_P4_TBPU_ESCR0 0x000003c2 -#define MSR_P4_TBPU_ESCR1 0x000003c3 -#define MSR_P4_TC_ESCR0 0x000003c4 -#define MSR_P4_TC_ESCR1 0x000003c5 -#define MSR_P4_U2L_ESCR0 0x000003b0 -#define MSR_P4_U2L_ESCR1 0x000003b1 - -#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 - -/* Intel Core-based CPU performance counters */ -#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 -#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a -#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b -#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d -#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e -#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f -#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 - -/* Geode defined MSRs */ -#define MSR_GEODE_BUSCONT_CONF0 0x00001900 - -/* Intel VT MSRs */ -#define MSR_IA32_VMX_BASIC 0x00000480 -#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 -#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 -#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 -#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 -#define MSR_IA32_VMX_MISC 0x00000485 -#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 -#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 -#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 -#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 -#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a -#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b -#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c -#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d -#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e -#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f -#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 -#define MSR_IA32_VMX_VMFUNC 0x00000491 - -/* VMX_BASIC bits and bitmasks */ -#define VMX_BASIC_VMCS_SIZE_SHIFT 32 -#define VMX_BASIC_TRUE_CTLS (1ULL << 55) -#define VMX_BASIC_64 0x0001000000000000LLU -#define VMX_BASIC_MEM_TYPE_SHIFT 50 -#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU -#define VMX_BASIC_MEM_TYPE_WB 6LLU -#define VMX_BASIC_INOUT 0x0040000000000000LLU - -/* MSR_IA32_VMX_MISC bits */ -#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) -#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F -/* AMD-V MSRs */ - -#define MSR_VM_CR 0xc0010114 -#define MSR_VM_IGNNE 0xc0010115 -#define MSR_VM_HSAVE_PA 0xc0010117 +#include <uapi/asm/msr-index.h> #endif /* _ASM_X86_MSR_INDEX_H */ diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h new file mode 100644 index 000000000000..d097e832ee3c --- /dev/null +++ b/arch/x86/include/uapi/asm/msr-index.h @@ -0,0 +1,698 @@ +#ifndef _UAPI_ASM_X86_MSR_INDEX_H +#define _UAPI_ASM_X86_MSR_INDEX_H + +/* + * CPU model specific register (MSR) numbers. + * + * Do not add new entries to this file unless the definitions are shared + * between multiple compilation units. + */ + +/* x86-64 specific MSRs */ +#define MSR_EFER 0xc0000080 /* extended feature register */ +#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ +#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ +#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ +#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ +#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ +#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ +#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ +#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ + +/* EFER bits: */ +#define _EFER_SCE 0 /* SYSCALL/SYSRET */ +#define _EFER_LME 8 /* Long mode enable */ +#define _EFER_LMA 10 /* Long mode active (read-only) */ +#define _EFER_NX 11 /* No execute enable */ +#define _EFER_SVME 12 /* Enable virtualization */ +#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ +#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ + +#define EFER_SCE (1<<_EFER_SCE) +#define EFER_LME (1<<_EFER_LME) +#define EFER_LMA (1<<_EFER_LMA) +#define EFER_NX (1<<_EFER_NX) +#define EFER_SVME (1<<_EFER_SVME) +#define EFER_LMSLE (1<<_EFER_LMSLE) +#define EFER_FFXSR (1<<_EFER_FFXSR) + +/* Intel MSRs. Some also available on other CPUs */ + +#define MSR_PPIN_CTL 0x0000004e +#define MSR_PPIN 0x0000004f + +#define MSR_IA32_PERFCTR0 0x000000c1 +#define MSR_IA32_PERFCTR1 0x000000c2 +#define MSR_FSB_FREQ 0x000000cd +#define MSR_PLATFORM_INFO 0x000000ce + +#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 +#define NHM_C3_AUTO_DEMOTE (1UL << 25) +#define NHM_C1_AUTO_DEMOTE (1UL << 26) +#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) +#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) +#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) + +#define MSR_MTRRcap 0x000000fe +#define MSR_IA32_BBL_CR_CTL 0x00000119 +#define MSR_IA32_BBL_CR_CTL3 0x0000011e + +#define MSR_IA32_SYSENTER_CS 0x00000174 +#define MSR_IA32_SYSENTER_ESP 0x00000175 +#define MSR_IA32_SYSENTER_EIP 0x00000176 + +#define MSR_IA32_MCG_CAP 0x00000179 +#define MSR_IA32_MCG_STATUS 0x0000017a +#define MSR_IA32_MCG_CTL 0x0000017b +#define MSR_IA32_MCG_EXT_CTL 0x000004d0 + +#define MSR_OFFCORE_RSP_0 0x000001a6 +#define MSR_OFFCORE_RSP_1 0x000001a7 +#define MSR_TURBO_RATIO_LIMIT 0x000001ad +#define MSR_TURBO_RATIO_LIMIT1 0x000001ae +#define MSR_TURBO_RATIO_LIMIT2 0x000001af + +#define MSR_LBR_SELECT 0x000001c8 +#define MSR_LBR_TOS 0x000001c9 +#define MSR_LBR_NHM_FROM 0x00000680 +#define MSR_LBR_NHM_TO 0x000006c0 +#define MSR_LBR_CORE_FROM 0x00000040 +#define MSR_LBR_CORE_TO 0x00000060 + +#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ +#define LBR_INFO_MISPRED BIT_ULL(63) +#define LBR_INFO_IN_TX BIT_ULL(62) +#define LBR_INFO_ABORT BIT_ULL(61) +#define LBR_INFO_CYCLES 0xffff + +#define MSR_IA32_PEBS_ENABLE 0x000003f1 +#define MSR_IA32_DS_AREA 0x00000600 +#define MSR_IA32_PERF_CAPABILITIES 0x00000345 +#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 + +#define MSR_IA32_RTIT_CTL 0x00000570 +#define MSR_IA32_RTIT_STATUS 0x00000571 +#define MSR_IA32_RTIT_ADDR0_A 0x00000580 +#define MSR_IA32_RTIT_ADDR0_B 0x00000581 +#define MSR_IA32_RTIT_ADDR1_A 0x00000582 +#define MSR_IA32_RTIT_ADDR1_B 0x00000583 +#define MSR_IA32_RTIT_ADDR2_A 0x00000584 +#define MSR_IA32_RTIT_ADDR2_B 0x00000585 +#define MSR_IA32_RTIT_ADDR3_A 0x00000586 +#define MSR_IA32_RTIT_ADDR3_B 0x00000587 +#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 +#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 +#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 + +#define MSR_MTRRfix64K_00000 0x00000250 +#define MSR_MTRRfix16K_80000 0x00000258 +#define MSR_MTRRfix16K_A0000 0x00000259 +#define MSR_MTRRfix4K_C0000 0x00000268 +#define MSR_MTRRfix4K_C8000 0x00000269 +#define MSR_MTRRfix4K_D0000 0x0000026a +#define MSR_MTRRfix4K_D8000 0x0000026b +#define MSR_MTRRfix4K_E0000 0x0000026c +#define MSR_MTRRfix4K_E8000 0x0000026d +#define MSR_MTRRfix4K_F0000 0x0000026e +#define MSR_MTRRfix4K_F8000 0x0000026f +#define MSR_MTRRdefType 0x000002ff + +#define MSR_IA32_CR_PAT 0x00000277 + +#define MSR_IA32_DEBUGCTLMSR 0x000001d9 +#define MSR_IA32_LASTBRANCHFROMIP 0x000001db +#define MSR_IA32_LASTBRANCHTOIP 0x000001dc +#define MSR_IA32_LASTINTFROMIP 0x000001dd +#define MSR_IA32_LASTINTTOIP 0x000001de + +/* DEBUGCTLMSR bits (others vary by model): */ +#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ +#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ +#define DEBUGCTLMSR_TR (1UL << 6) +#define DEBUGCTLMSR_BTS (1UL << 7) +#define DEBUGCTLMSR_BTINT (1UL << 8) +#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) +#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) +#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) + +#define MSR_PEBS_FRONTEND 0x000003f7 + +#define MSR_IA32_POWER_CTL 0x000001fc + +#define MSR_IA32_MC0_CTL 0x00000400 +#define MSR_IA32_MC0_STATUS 0x00000401 +#define MSR_IA32_MC0_ADDR 0x00000402 +#define MSR_IA32_MC0_MISC 0x00000403 + +/* C-state Residency Counters */ +#define MSR_PKG_C3_RESIDENCY 0x000003f8 +#define MSR_PKG_C6_RESIDENCY 0x000003f9 +#define MSR_PKG_C7_RESIDENCY 0x000003fa +#define MSR_CORE_C3_RESIDENCY 0x000003fc +#define MSR_CORE_C6_RESIDENCY 0x000003fd +#define MSR_CORE_C7_RESIDENCY 0x000003fe +#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff +#define MSR_PKG_C2_RESIDENCY 0x0000060d +#define MSR_PKG_C8_RESIDENCY 0x00000630 +#define MSR_PKG_C9_RESIDENCY 0x00000631 +#define MSR_PKG_C10_RESIDENCY 0x00000632 + +/* Interrupt Response Limit */ +#define MSR_PKGC3_IRTL 0x0000060a +#define MSR_PKGC6_IRTL 0x0000060b +#define MSR_PKGC7_IRTL 0x0000060c +#define MSR_PKGC8_IRTL 0x00000633 +#define MSR_PKGC9_IRTL 0x00000634 +#define MSR_PKGC10_IRTL 0x00000635 + +/* Run Time Average Power Limiting (RAPL) Interface */ + +#define MSR_RAPL_POWER_UNIT 0x00000606 + +#define MSR_PKG_POWER_LIMIT 0x00000610 +#define MSR_PKG_ENERGY_STATUS 0x00000611 +#define MSR_PKG_PERF_STATUS 0x00000613 +#define MSR_PKG_POWER_INFO 0x00000614 + +#define MSR_DRAM_POWER_LIMIT 0x00000618 +#define MSR_DRAM_ENERGY_STATUS 0x00000619 +#define MSR_DRAM_PERF_STATUS 0x0000061b +#define MSR_DRAM_POWER_INFO 0x0000061c + +#define MSR_PP0_POWER_LIMIT 0x00000638 +#define MSR_PP0_ENERGY_STATUS 0x00000639 +#define MSR_PP0_POLICY 0x0000063a +#define MSR_PP0_PERF_STATUS 0x0000063b + +#define MSR_PP1_POWER_LIMIT 0x00000640 +#define MSR_PP1_ENERGY_STATUS 0x00000641 +#define MSR_PP1_POLICY 0x00000642 + +/* Config TDP MSRs */ +#define MSR_CONFIG_TDP_NOMINAL 0x00000648 +#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 +#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A +#define MSR_CONFIG_TDP_CONTROL 0x0000064B +#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C + +#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D + +#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 +#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 +#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A +#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B + +#define MSR_CORE_C1_RES 0x00000660 + +#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 +#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 + +#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 +#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 +#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 + +/* Hardware P state interface */ +#define MSR_PPERF 0x0000064e +#define MSR_PERF_LIMIT_REASONS 0x0000064f +#define MSR_PM_ENABLE 0x00000770 +#define MSR_HWP_CAPABILITIES 0x00000771 +#define MSR_HWP_REQUEST_PKG 0x00000772 +#define MSR_HWP_INTERRUPT 0x00000773 +#define MSR_HWP_REQUEST 0x00000774 +#define MSR_HWP_STATUS 0x00000777 + +/* CPUID.6.EAX */ +#define HWP_BASE_BIT (1<<7) +#define HWP_NOTIFICATIONS_BIT (1<<8) +#define HWP_ACTIVITY_WINDOW_BIT (1<<9) +#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) +#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) + +/* IA32_HWP_CAPABILITIES */ +#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) +#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) +#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) +#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) + +/* IA32_HWP_REQUEST */ +#define HWP_MIN_PERF(x) (x & 0xff) +#define HWP_MAX_PERF(x) ((x & 0xff) << 8) +#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) +#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) +#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) +#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) + +/* IA32_HWP_STATUS */ +#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) + +/* IA32_HWP_INTERRUPT */ +#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) + +#define MSR_AMD64_MC0_MASK 0xc0010044 + +#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) +#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) +#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) +#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) + +#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) + +/* These are consecutive and not in the normal 4er MCE bank block */ +#define MSR_IA32_MC0_CTL2 0x00000280 +#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) + +#define MSR_P6_PERFCTR0 0x000000c1 +#define MSR_P6_PERFCTR1 0x000000c2 +#define MSR_P6_EVNTSEL0 0x00000186 +#define MSR_P6_EVNTSEL1 0x00000187 + +#define MSR_KNC_PERFCTR0 0x00000020 +#define MSR_KNC_PERFCTR1 0x00000021 +#define MSR_KNC_EVNTSEL0 0x00000028 +#define MSR_KNC_EVNTSEL1 0x00000029 + +/* Alternative perfctr range with full access. */ +#define MSR_IA32_PMC0 0x000004c1 + +/* AMD64 MSRs. Not complete. See the architecture manual for a more + complete list. */ + +#define MSR_AMD64_PATCH_LEVEL 0x0000008b +#define MSR_AMD64_TSC_RATIO 0xc0000104 +#define MSR_AMD64_NB_CFG 0xc001001f +#define MSR_AMD64_PATCH_LOADER 0xc0010020 +#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 +#define MSR_AMD64_OSVW_STATUS 0xc0010141 +#define MSR_AMD64_LS_CFG 0xc0011020 +#define MSR_AMD64_DC_CFG 0xc0011022 +#define MSR_AMD64_BU_CFG2 0xc001102a +#define MSR_AMD64_IBSFETCHCTL 0xc0011030 +#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 +#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 +#define MSR_AMD64_IBSFETCH_REG_COUNT 3 +#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) +#define MSR_AMD64_IBSOPCTL 0xc0011033 +#define MSR_AMD64_IBSOPRIP 0xc0011034 +#define MSR_AMD64_IBSOPDATA 0xc0011035 +#define MSR_AMD64_IBSOPDATA2 0xc0011036 +#define MSR_AMD64_IBSOPDATA3 0xc0011037 +#define MSR_AMD64_IBSDCLINAD 0xc0011038 +#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 +#define MSR_AMD64_IBSOP_REG_COUNT 7 +#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) +#define MSR_AMD64_IBSCTL 0xc001103a +#define MSR_AMD64_IBSBRTARGET 0xc001103b +#define MSR_AMD64_IBSOPDATA4 0xc001103d +#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ + +/* Fam 17h MSRs */ +#define MSR_F17H_IRPERF 0xc00000e9 + +/* Fam 16h MSRs */ +#define MSR_F16H_L2I_PERF_CTL 0xc0010230 +#define MSR_F16H_L2I_PERF_CTR 0xc0010231 +#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 +#define MSR_F16H_DR2_ADDR_MASK 0xc001101a +#define MSR_F16H_DR3_ADDR_MASK 0xc001101b +#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 + +/* Fam 15h MSRs */ +#define MSR_F15H_PERF_CTL 0xc0010200 +#define MSR_F15H_PERF_CTR 0xc0010201 +#define MSR_F15H_NB_PERF_CTL 0xc0010240 +#define MSR_F15H_NB_PERF_CTR 0xc0010241 +#define MSR_F15H_PTSC 0xc0010280 +#define MSR_F15H_IC_CFG 0xc0011021 + +/* Fam 10h MSRs */ +#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 +#define FAM10H_MMIO_CONF_ENABLE (1<<0) +#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf +#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 +#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL +#define FAM10H_MMIO_CONF_BASE_SHIFT 20 +#define MSR_FAM10H_NODE_ID 0xc001100c + +/* K8 MSRs */ +#define MSR_K8_TOP_MEM1 0xc001001a +#define MSR_K8_TOP_MEM2 0xc001001d +#define MSR_K8_SYSCFG 0xc0010010 +#define MSR_K8_INT_PENDING_MSG 0xc0010055 +/* C1E active bits in int pending message */ +#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 +#define MSR_K8_TSEG_ADDR 0xc0010112 +#define MSR_K8_TSEG_MASK 0xc0010113 +#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ +#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ +#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ + +/* K7 MSRs */ +#define MSR_K7_EVNTSEL0 0xc0010000 +#define MSR_K7_PERFCTR0 0xc0010004 +#define MSR_K7_EVNTSEL1 0xc0010001 +#define MSR_K7_PERFCTR1 0xc0010005 +#define MSR_K7_EVNTSEL2 0xc0010002 +#define MSR_K7_PERFCTR2 0xc0010006 +#define MSR_K7_EVNTSEL3 0xc0010003 +#define MSR_K7_PERFCTR3 0xc0010007 +#define MSR_K7_CLK_CTL 0xc001001b +#define MSR_K7_HWCR 0xc0010015 +#define MSR_K7_FID_VID_CTL 0xc0010041 +#define MSR_K7_FID_VID_STATUS 0xc0010042 + +/* K6 MSRs */ +#define MSR_K6_WHCR 0xc0000082 +#define MSR_K6_UWCCR 0xc0000085 +#define MSR_K6_EPMR 0xc0000086 +#define MSR_K6_PSOR 0xc0000087 +#define MSR_K6_PFIR 0xc0000088 + +/* Centaur-Hauls/IDT defined MSRs. */ +#define MSR_IDT_FCR1 0x00000107 +#define MSR_IDT_FCR2 0x00000108 +#define MSR_IDT_FCR3 0x00000109 +#define MSR_IDT_FCR4 0x0000010a + +#define MSR_IDT_MCR0 0x00000110 +#define MSR_IDT_MCR1 0x00000111 +#define MSR_IDT_MCR2 0x00000112 +#define MSR_IDT_MCR3 0x00000113 +#define MSR_IDT_MCR4 0x00000114 +#define MSR_IDT_MCR5 0x00000115 +#define MSR_IDT_MCR6 0x00000116 +#define MSR_IDT_MCR7 0x00000117 +#define MSR_IDT_MCR_CTRL 0x00000120 + +/* VIA Cyrix defined MSRs*/ +#define MSR_VIA_FCR 0x00001107 +#define MSR_VIA_LONGHAUL 0x0000110a +#define MSR_VIA_RNG 0x0000110b +#define MSR_VIA_BCR2 0x00001147 + +/* Transmeta defined MSRs */ +#define MSR_TMTA_LONGRUN_CTRL 0x80868010 +#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 +#define MSR_TMTA_LRTI_READOUT 0x80868018 +#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a + +/* Intel defined MSRs. */ +#define MSR_IA32_P5_MC_ADDR 0x00000000 +#define MSR_IA32_P5_MC_TYPE 0x00000001 +#define MSR_IA32_TSC 0x00000010 +#define MSR_IA32_PLATFORM_ID 0x00000017 +#define MSR_IA32_EBL_CR_POWERON 0x0000002a +#define MSR_EBC_FREQUENCY_ID 0x0000002c +#define MSR_SMI_COUNT 0x00000034 +#define MSR_IA32_FEATURE_CONTROL 0x0000003a +#define MSR_IA32_TSC_ADJUST 0x0000003b +#define MSR_IA32_BNDCFGS 0x00000d90 + +#define MSR_IA32_XSS 0x00000da0 + +#define FEATURE_CONTROL_LOCKED (1<<0) +#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) +#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) +#define FEATURE_CONTROL_LMCE (1<<20) + +#define MSR_IA32_APICBASE 0x0000001b +#define MSR_IA32_APICBASE_BSP (1<<8) +#define MSR_IA32_APICBASE_ENABLE (1<<11) +#define MSR_IA32_APICBASE_BASE (0xfffff<<12) + +#define MSR_IA32_TSCDEADLINE 0x000006e0 + +#define MSR_IA32_UCODE_WRITE 0x00000079 +#define MSR_IA32_UCODE_REV 0x0000008b + +#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b +#define MSR_IA32_SMBASE 0x0000009e + +#define MSR_IA32_PERF_STATUS 0x00000198 +#define MSR_IA32_PERF_CTL 0x00000199 +#define INTEL_PERF_CTL_MASK 0xffff +#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 +#define MSR_AMD_PERF_STATUS 0xc0010063 +#define MSR_AMD_PERF_CTL 0xc0010062 + +#define MSR_IA32_MPERF 0x000000e7 +#define MSR_IA32_APERF 0x000000e8 + +#define MSR_IA32_THERM_CONTROL 0x0000019a +#define MSR_IA32_THERM_INTERRUPT 0x0000019b + +#define THERM_INT_HIGH_ENABLE (1 << 0) +#define THERM_INT_LOW_ENABLE (1 << 1) +#define THERM_INT_PLN_ENABLE (1 << 24) + +#define MSR_IA32_THERM_STATUS 0x0000019c + +#define THERM_STATUS_PROCHOT (1 << 0) +#define THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_THERM2_CTL 0x0000019d + +#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) + +#define MSR_IA32_MISC_ENABLE 0x000001a0 + +#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 + +#define MSR_MISC_PWR_MGMT 0x000001aa + +#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 +#define ENERGY_PERF_BIAS_PERFORMANCE 0 +#define ENERGY_PERF_BIAS_NORMAL 6 +#define ENERGY_PERF_BIAS_POWERSAVE 15 + +#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 + +#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) +#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 + +#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) +#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) +#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) + +/* Thermal Thresholds Support */ +#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) +#define THERM_SHIFT_THRESHOLD0 8 +#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) +#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) +#define THERM_SHIFT_THRESHOLD1 16 +#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) +#define THERM_STATUS_THRESHOLD0 (1 << 6) +#define THERM_LOG_THRESHOLD0 (1 << 7) +#define THERM_STATUS_THRESHOLD1 (1 << 8) +#define THERM_LOG_THRESHOLD1 (1 << 9) + +/* MISC_ENABLE bits: architectural */ +#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 +#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) +#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 +#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) +#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 +#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) +#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 +#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 +#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) + +/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ +#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 +#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) +#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 +#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) +#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 +#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) + +#define MSR_IA32_TSC_DEADLINE 0x000006E0 + +/* P4/Xeon+ specific */ +#define MSR_IA32_MCG_EAX 0x00000180 +#define MSR_IA32_MCG_EBX 0x00000181 +#define MSR_IA32_MCG_ECX 0x00000182 +#define MSR_IA32_MCG_EDX 0x00000183 +#define MSR_IA32_MCG_ESI 0x00000184 +#define MSR_IA32_MCG_EDI 0x00000185 +#define MSR_IA32_MCG_EBP 0x00000186 +#define MSR_IA32_MCG_ESP 0x00000187 +#define MSR_IA32_MCG_EFLAGS 0x00000188 +#define MSR_IA32_MCG_EIP 0x00000189 +#define MSR_IA32_MCG_RESERVED 0x0000018a + +/* Pentium IV performance counter MSRs */ +#define MSR_P4_BPU_PERFCTR0 0x00000300 +#define MSR_P4_BPU_PERFCTR1 0x00000301 +#define MSR_P4_BPU_PERFCTR2 0x00000302 +#define MSR_P4_BPU_PERFCTR3 0x00000303 +#define MSR_P4_MS_PERFCTR0 0x00000304 +#define MSR_P4_MS_PERFCTR1 0x00000305 +#define MSR_P4_MS_PERFCTR2 0x00000306 +#define MSR_P4_MS_PERFCTR3 0x00000307 +#define MSR_P4_FLAME_PERFCTR0 0x00000308 +#define MSR_P4_FLAME_PERFCTR1 0x00000309 +#define MSR_P4_FLAME_PERFCTR2 0x0000030a +#define MSR_P4_FLAME_PERFCTR3 0x0000030b +#define MSR_P4_IQ_PERFCTR0 0x0000030c +#define MSR_P4_IQ_PERFCTR1 0x0000030d +#define MSR_P4_IQ_PERFCTR2 0x0000030e +#define MSR_P4_IQ_PERFCTR3 0x0000030f +#define MSR_P4_IQ_PERFCTR4 0x00000310 +#define MSR_P4_IQ_PERFCTR5 0x00000311 +#define MSR_P4_BPU_CCCR0 0x00000360 +#define MSR_P4_BPU_CCCR1 0x00000361 +#define MSR_P4_BPU_CCCR2 0x00000362 +#define MSR_P4_BPU_CCCR3 0x00000363 +#define MSR_P4_MS_CCCR0 0x00000364 +#define MSR_P4_MS_CCCR1 0x00000365 +#define MSR_P4_MS_CCCR2 0x00000366 +#define MSR_P4_MS_CCCR3 0x00000367 +#define MSR_P4_FLAME_CCCR0 0x00000368 +#define MSR_P4_FLAME_CCCR1 0x00000369 +#define MSR_P4_FLAME_CCCR2 0x0000036a +#define MSR_P4_FLAME_CCCR3 0x0000036b +#define MSR_P4_IQ_CCCR0 0x0000036c +#define MSR_P4_IQ_CCCR1 0x0000036d +#define MSR_P4_IQ_CCCR2 0x0000036e +#define MSR_P4_IQ_CCCR3 0x0000036f +#define MSR_P4_IQ_CCCR4 0x00000370 +#define MSR_P4_IQ_CCCR5 0x00000371 +#define MSR_P4_ALF_ESCR0 0x000003ca +#define MSR_P4_ALF_ESCR1 0x000003cb +#define MSR_P4_BPU_ESCR0 0x000003b2 +#define MSR_P4_BPU_ESCR1 0x000003b3 +#define MSR_P4_BSU_ESCR0 0x000003a0 +#define MSR_P4_BSU_ESCR1 0x000003a1 +#define MSR_P4_CRU_ESCR0 0x000003b8 +#define MSR_P4_CRU_ESCR1 0x000003b9 +#define MSR_P4_CRU_ESCR2 0x000003cc +#define MSR_P4_CRU_ESCR3 0x000003cd +#define MSR_P4_CRU_ESCR4 0x000003e0 +#define MSR_P4_CRU_ESCR5 0x000003e1 +#define MSR_P4_DAC_ESCR0 0x000003a8 +#define MSR_P4_DAC_ESCR1 0x000003a9 +#define MSR_P4_FIRM_ESCR0 0x000003a4 +#define MSR_P4_FIRM_ESCR1 0x000003a5 +#define MSR_P4_FLAME_ESCR0 0x000003a6 +#define MSR_P4_FLAME_ESCR1 0x000003a7 +#define MSR_P4_FSB_ESCR0 0x000003a2 +#define MSR_P4_FSB_ESCR1 0x000003a3 +#define MSR_P4_IQ_ESCR0 0x000003ba +#define MSR_P4_IQ_ESCR1 0x000003bb +#define MSR_P4_IS_ESCR0 0x000003b4 +#define MSR_P4_IS_ESCR1 0x000003b5 +#define MSR_P4_ITLB_ESCR0 0x000003b6 +#define MSR_P4_ITLB_ESCR1 0x000003b7 +#define MSR_P4_IX_ESCR0 0x000003c8 +#define MSR_P4_IX_ESCR1 0x000003c9 +#define MSR_P4_MOB_ESCR0 0x000003aa +#define MSR_P4_MOB_ESCR1 0x000003ab +#define MSR_P4_MS_ESCR0 0x000003c0 +#define MSR_P4_MS_ESCR1 0x000003c1 +#define MSR_P4_PMH_ESCR0 0x000003ac +#define MSR_P4_PMH_ESCR1 0x000003ad +#define MSR_P4_RAT_ESCR0 0x000003bc +#define MSR_P4_RAT_ESCR1 0x000003bd +#define MSR_P4_SAAT_ESCR0 0x000003ae +#define MSR_P4_SAAT_ESCR1 0x000003af +#define MSR_P4_SSU_ESCR0 0x000003be +#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ + +#define MSR_P4_TBPU_ESCR0 0x000003c2 +#define MSR_P4_TBPU_ESCR1 0x000003c3 +#define MSR_P4_TC_ESCR0 0x000003c4 +#define MSR_P4_TC_ESCR1 0x000003c5 +#define MSR_P4_U2L_ESCR0 0x000003b0 +#define MSR_P4_U2L_ESCR1 0x000003b1 + +#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 + +/* Intel Core-based CPU performance counters */ +#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 +#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a +#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b +#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d +#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e +#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f +#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 + +/* Geode defined MSRs */ +#define MSR_GEODE_BUSCONT_CONF0 0x00001900 + +/* Intel VT MSRs */ +#define MSR_IA32_VMX_BASIC 0x00000480 +#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 +#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 +#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 +#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 +#define MSR_IA32_VMX_MISC 0x00000485 +#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 +#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 +#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 +#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 +#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a +#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b +#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c +#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d +#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e +#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f +#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 +#define MSR_IA32_VMX_VMFUNC 0x00000491 + +/* VMX_BASIC bits and bitmasks */ +#define VMX_BASIC_VMCS_SIZE_SHIFT 32 +#define VMX_BASIC_TRUE_CTLS (1ULL << 55) +#define VMX_BASIC_64 0x0001000000000000LLU +#define VMX_BASIC_MEM_TYPE_SHIFT 50 +#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU +#define VMX_BASIC_MEM_TYPE_WB 6LLU +#define VMX_BASIC_INOUT 0x0040000000000000LLU + +/* MSR_IA32_VMX_MISC bits */ +#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) +#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F +/* AMD-V MSRs */ + +#define MSR_VM_CR 0xc0010114 +#define MSR_VM_IGNNE 0xc0010115 +#define MSR_VM_HSAVE_PA 0xc0010117 + +#endif /* _UAPI_ASM_X86_MSR_INDEX_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 5/7] Makefile.headersinst: cleanup input files 2017-01-06 9:43 ` Nicolas Dichtel ` (15 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that unput-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 5/7] Makefile.headersinst: cleanup input files 2017-01-06 9:43 ` Nicolas Dichtel ` (7 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that unput-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 5/7] Makefile.headersinst: cleanup input files @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-me After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that unput-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 5/7] Makefile.headersinst: cleanup input files @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: openrisc After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that unput-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 5/7] Makefile.headersinst: cleanup input files @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: linux-arm-kernel After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that unput-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 5/7] Makefile.headersinst: cleanup input files @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: linux-snps-arc After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that unput-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 5/7] Makefile.headersinst: cleanup input files @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, Nicolas Dichtel After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that unput-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 5/7] Makefile.headersinst: cleanup input files @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-me After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that unput-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 5/7] Makefile.headersinst: cleanup input files @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, Nicolas Dichtel After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that unput-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 5/7] Makefile.headersinst: cleanup input files @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-me QWZ0ZXIgdGhlIGxhc3QgZm91ciBwYXRjaGVzLCBhbGwgZXhwb3J0ZWQgaGVhZGVycyBhcmUgdW5k ZXIgdWFwaS8sIHRodXMKaW5wdXQtZmlsZXMyIGFyZSBub3QgbmVlZGVkIGFueW1vcmUuClRoZSBz aWRlIGVmZmVjdCBpcyB0aGF0IGlucHV0LWZpbGVzMS1uYW1lIGlzIGV4YWN0bHkgaGVhZGVyLXku CgpOb3RlIGFsc28gdGhhdCB1bnB1dC1maWxlczMtbmFtZSBpcyBnZW5oZHIteS4KClNpZ25lZC1v ZmYtYnk6IE5pY29sYXMgRGljaHRlbCA8bmljb2xhcy5kaWNodGVsQDZ3aW5kLmNvbT4KLS0tCiBz Y3JpcHRzL01ha2VmaWxlLmhlYWRlcnNpbnN0IHwgMzQgKysrKysrKysrKystLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL3NjcmlwdHMvTWFrZWZpbGUuaGVhZGVyc2luc3QgYi9zY3JpcHRz L01ha2VmaWxlLmhlYWRlcnNpbnN0CmluZGV4IDExMDZkNmNhM2EzOC4uM2UyMGQwMzQzMmQyIDEw MDY0NAotLS0gYS9zY3JpcHRzL01ha2VmaWxlLmhlYWRlcnNpbnN0CisrKyBiL3NjcmlwdHMvTWFr ZWZpbGUuaGVhZGVyc2luc3QKQEAgLTQwLDMxICs0MCwyMCBAQCB3cmFwcGVyLWZpbGVzIDo9ICQo ZmlsdGVyICQoaGVhZGVyLXkpLCAkKGdlbmVyaWMteSkpCiBzcmNkaXIgICAgICAgIDo9ICQoc3Jj dHJlZSkvJChvYmopCiBnZW5kaXIgICAgICAgIDo9ICQob2JqdHJlZSkvJChnZW4pCiAKLW9sZHNy Y2RpciAgICAgOj0gJChzcmN0cmVlKS8kKHN1YnN0IC91YXBpLCwkKG9iaikpCi0KICMgYWxsIGhl YWRlcnMgZmlsZXMgZm9yIHRoaXMgZGlyCiBoZWFkZXIteSAgICAgIDo9ICQoZmlsdGVyLW91dCAk KGdlbmVyaWMteSksICQoaGVhZGVyLXkpKQogYWxsLWZpbGVzICAgICA6PSAkKGhlYWRlci15KSAk KGdlbmhkci15KSAkKHdyYXBwZXItZmlsZXMpCiBvdXRwdXQtZmlsZXMgIDo9ICQoYWRkcHJlZml4 ICQoaW5zdGFsbGRpcikvLCAkKGFsbC1maWxlcykpCiAKLWlucHV0LWZpbGVzMSAgOj0gJChmb3Jl YWNoIGhkciwgJChoZWFkZXIteSksIFwKLQkJICAgJChpZiAkKHdpbGRjYXJkICQoc3JjZGlyKS8k KGhkcikpLCBcCi0JCQkkKHdpbGRjYXJkICQoc3JjZGlyKS8kKGhkcikpKSBcCi0JCSAgICkKLWlu cHV0LWZpbGVzMS1uYW1lIDo9ICQobm90ZGlyICQoaW5wdXQtZmlsZXMxKSkKLWlucHV0LWZpbGVz MiAgOj0gJChmb3JlYWNoIGhkciwgJChoZWFkZXIteSksIFwKLQkJICAgJChpZiAgJCh3aWxkY2Fy ZCAkKHNyY2RpcikvJChoZHIpKSwsIFwKLQkJCSQoaWYgJCh3aWxkY2FyZCAkKG9sZHNyY2Rpcikv JChoZHIpKSwgXAotCQkJCSQod2lsZGNhcmQgJChvbGRzcmNkaXIpLyQoaGRyKSksIFwKLQkJCQkk KGVycm9yIE1pc3NpbmcgVUFQSSBmaWxlICQoc3JjZGlyKS8kKGhkcikpKSBcCi0JCSAgICkpCi1p bnB1dC1maWxlczItbmFtZSA6PSAkKG5vdGRpciAkKGlucHV0LWZpbGVzMikpCi1pbnB1dC1maWxl czMgIDo9ICQoZm9yZWFjaCBoZHIsICQoZ2VuaGRyLXkpLCBcCi0JCSAgICQoaWYJJCh3aWxkY2Fy ZCAkKGdlbmRpcikvJChoZHIpKSwgXAotCQkJJCh3aWxkY2FyZCAkKGdlbmRpcikvJChoZHIpKSwg XAotCQkJJChlcnJvciBNaXNzaW5nIGdlbmVyYXRlZCBVQVBJIGZpbGUgJChnZW5kaXIpLyQoaGRy KSkgXAotCQkgICApKQotaW5wdXQtZmlsZXMzLW5hbWUgOj0gJChub3RkaXIgJChpbnB1dC1maWxl czMpKQorIyBDaGVjayB0aGF0IGFsbCBleHBlY3RlZCBmaWxlcyBleGlzdAorJChmb3JlYWNoIGhk ciwgJChoZWFkZXIteSksIFwKKyAgJChpZiAkKHdpbGRjYXJkICQoc3JjZGlyKS8kKGhkcikpLCwg XAorICAgICAgICQoZXJyb3IgTWlzc2luZyBVQVBJIGZpbGUgJChzcmNkaXIpLyQoaGRyKSkgXAor ICAgKSkKKyQoZm9yZWFjaCBoZHIsICQoZ2VuaGRyLXkpLCBcCisgICQoaWYJJCh3aWxkY2FyZCAk KGdlbmRpcikvJChoZHIpKSwsIFwKKyAgICAgICAkKGVycm9yIE1pc3NpbmcgZ2VuZXJhdGVkIFVB UEkgZmlsZSAkKGdlbmRpcikvJChoZHIpKSBcCisgICkpCiAKICMgV29yayBvdXQgd2hhdCBuZWVk cyB0byBiZSByZW1vdmVkCiBvbGRoZWFkZXJzICAgIDo9ICQocGF0c3Vic3QgJChpbnN0YWxsZGly KS8lLCUsJCh3aWxkY2FyZCAkKGluc3RhbGxkaXIpLyouaCkpCkBAIC03OCw5ICs2Nyw4IEBAIHBy aW50ZGlyID0gJChwYXRzdWJzdCAkKElOU1RBTExfSERSX1BBVEgpLyUvLCUsJChkaXIgJEApKQog cXVpZXRfY21kX2luc3RhbGwgPSBJTlNUQUxMICQocHJpbnRkaXIpICgkKHdvcmRzICQoYWxsLWZp bGVzKSlcCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmlsZSQoaWYgJCh3b3JkIDIsICQo YWxsLWZpbGVzKSkscykpCiAgICAgICBjbWRfaW5zdGFsbCA9IFwKLSAgICAgICAgJChDT05GSUdf U0hFTEwpICQ8ICQoaW5zdGFsbGRpcikgJChzcmNkaXIpICQoaW5wdXQtZmlsZXMxLW5hbWUpOyBc Ci0gICAgICAgICQoQ09ORklHX1NIRUxMKSAkPCAkKGluc3RhbGxkaXIpICQob2xkc3JjZGlyKSAk KGlucHV0LWZpbGVzMi1uYW1lKTsgXAotICAgICAgICAkKENPTkZJR19TSEVMTCkgJDwgJChpbnN0 YWxsZGlyKSAkKGdlbmRpcikgJChpbnB1dC1maWxlczMtbmFtZSk7IFwKKyAgICAgICAgJChDT05G SUdfU0hFTEwpICQ8ICQoaW5zdGFsbGRpcikgJChzcmNkaXIpICQoaGVhZGVyLXkpOyBcCisgICAg ICAgICQoQ09ORklHX1NIRUxMKSAkPCAkKGluc3RhbGxkaXIpICQoZ2VuZGlyKSAkKGdlbmhkci15 KTsgXAogICAgICAgICBmb3IgRiBpbiAkKHdyYXBwZXItZmlsZXMpOyBkbyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgXAogICAgICAgICAgICAgICAgIGVjaG8gIlwjaW5jbHVkZSA8 YXNtLWdlbmVyaWMvJCRGPiIgPiAkKGluc3RhbGxkaXIpLyQkRjsgICAgXAogICAgICAgICBkb25l OyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgXAotLSAKMi44LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0 dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 5/7] Makefile.headersinst: cleanup input files @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that unput-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 6/7] Makefile.headersinst: remove destination-y option 2017-01-06 9:43 ` Nicolas Dichtel ` (17 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 6/7] Makefile.headersinst: remove destination-y option 2017-01-06 9:43 ` Nicolas Dichtel ` (7 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. == 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y == 8 Kbuild Variables == 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 6/7] Makefile.headersinst: remove destination-y option @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-me This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. == 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y == 8 Kbuild Variables == 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 6/7] Makefile.headersinst: remove destination-y option @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: openrisc This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 6/7] Makefile.headersinst: remove destination-y option @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: linux-arm-kernel This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 6/7] Makefile.headersinst: remove destination-y option @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: linux-snps-arc This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 6/7] Makefile.headersinst: remove destination-y option @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, Nicolas Dichtel This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 6/7] Makefile.headersinst: remove destination-y option @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-me This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 6/7] Makefile.headersinst: remove destination-y option @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, Nicolas Dichtel This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 6/7] Makefile.headersinst: remove destination-y option @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-me VGhpcyBvcHRpb24gd2FzIGFkZGVkIGluIGNvbW1pdCBjN2JiMzQ5ZTdjMjUgKCJrYnVpbGQ6IGlu dHJvZHVjZSBkZXN0aW5hdGlvbi15CmZvciBleHBvcnRlZCBoZWFkZXJzIikgYnV0IG5ldmVyIHVz ZWQgaW4tdHJlZS4KClNpZ25lZC1vZmYtYnk6IE5pY29sYXMgRGljaHRlbCA8bmljb2xhcy5kaWNo dGVsQDZ3aW5kLmNvbT4KLS0tCiBEb2N1bWVudGF0aW9uL2tidWlsZC9tYWtlZmlsZXMudHh0IHwg MjMgKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIHNjcmlwdHMvTWFrZWZpbGUuaGVhZGVyc2luc3Qg ICAgICAgfCAgMiArLQogMiBmaWxlcyBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDIwIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24va2J1aWxkL21ha2VmaWxlcy50eHQg Yi9Eb2N1bWVudGF0aW9uL2tidWlsZC9tYWtlZmlsZXMudHh0CmluZGV4IDliOWM0Nzk3ZmM1NS4u MzdiNTI1ZDMyOWFlIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2tidWlsZC9tYWtlZmlsZXMu dHh0CisrKyBiL0RvY3VtZW50YXRpb24va2J1aWxkL21ha2VmaWxlcy50eHQKQEAgLTQ2LDkgKzQ2 LDggQEAgVGhpcyBkb2N1bWVudCBkZXNjcmliZXMgdGhlIExpbnV4IGtlcm5lbCBNYWtlZmlsZXMu CiAJPT09IDcgS2J1aWxkIHN5bnRheCBmb3IgZXhwb3J0ZWQgaGVhZGVycwogCQktLS0gNy4xIGhl YWRlci15CiAJCS0tLSA3LjIgZ2VuaGRyLXkKLQkJLS0tIDcuMyBkZXN0aW5hdGlvbi15Ci0JCS0t LSA3LjQgZ2VuZXJpYy15Ci0JCS0tLSA3LjUgZ2VuZXJhdGVkLXkKKwkJLS0tIDcuMyBnZW5lcmlj LXkKKwkJLS0tIDcuNCBnZW5lcmF0ZWQteQogCiAJPT09IDggS2J1aWxkIFZhcmlhYmxlcwogCT09 PSA5IE1ha2VmaWxlIGxhbmd1YWdlCkBAIC0xMjk1LDIxICsxMjk0LDcgQEAgU2VlIHN1YnNlcXVl bnQgY2hhcHRlciBmb3IgdGhlIHN5bnRheCBvZiB0aGUgS2J1aWxkIGZpbGUuCiAJCQkjaW5jbHVk ZS9saW51eC9LYnVpbGQKIAkJCWdlbmhkci15ICs9IHZlcnNpb24uaAogCi0JLS0tIDcuMyBkZXN0 aW5hdGlvbi15Ci0KLQlXaGVuIGFuIGFyY2hpdGVjdHVyZSBoYXMgYSBzZXQgb2YgZXhwb3J0ZWQg aGVhZGVycyB0aGF0IG5lZWRzIHRvIGJlCi0JZXhwb3J0ZWQgdG8gYSBkaWZmZXJlbnQgZGlyZWN0 b3J5IGRlc3RpbmF0aW9uLXkgaXMgdXNlZC4KLQlkZXN0aW5hdGlvbi15IHNwZWNpZmllcyB0aGUg ZGVzdGluYXRpb24gZGlyZWN0b3J5IGZvciBhbGwgZXhwb3J0ZWQKLQloZWFkZXJzIGluIHRoZSBm aWxlIHdoZXJlIGl0IGlzIHByZXNlbnQuCi0KLQkJRXhhbXBsZToKLQkJCSNhcmNoL3h0ZW5zYS9w bGF0Zm9ybXMvczYxMDUvaW5jbHVkZS9wbGF0Zm9ybS9LYnVpbGQKLQkJCWRlc3RpbmF0aW9uLXkg Oj0gaW5jbHVkZS9saW51eAotCi0JSW4gdGhlIGV4YW1wbGUgYWJvdmUgYWxsIGV4cG9ydGVkIGhl YWRlcnMgaW4gdGhlIEtidWlsZCBmaWxlCi0Jd2lsbCBiZSBsb2NhdGVkIGluIHRoZSBkaXJlY3Rv cnkgImluY2x1ZGUvbGludXgiIHdoZW4gZXhwb3J0ZWQuCi0KLQktLS0gNy40IGdlbmVyaWMteQor CS0tLSA3LjMgZ2VuZXJpYy15CiAKIAlJZiBhbiBhcmNoaXRlY3R1cmUgdXNlcyBhIHZlcmJhdGlt IGNvcHkgb2YgYSBoZWFkZXIgZnJvbQogCWluY2x1ZGUvYXNtLWdlbmVyaWMgdGhlbiB0aGlzIGlz IGxpc3RlZCBpbiB0aGUgZmlsZQpAQCAtMTMzNiw3ICsxMzIxLDcgQEAgU2VlIHN1YnNlcXVlbnQg Y2hhcHRlciBmb3IgdGhlIHN5bnRheCBvZiB0aGUgS2J1aWxkIGZpbGUuCiAJCUV4YW1wbGU6IHRl cm1pb3MuaAogCQkJI2luY2x1ZGUgPGFzbS1nZW5lcmljL3Rlcm1pb3MuaD4KIAotCS0tLSA3LjUg Z2VuZXJhdGVkLXkKKwktLS0gNy40IGdlbmVyYXRlZC15CiAKIAlJZiBhbiBhcmNoaXRlY3R1cmUg Z2VuZXJhdGVzIG90aGVyIGhlYWRlciBmaWxlcyBhbG9uZ3NpZGUgZ2VuZXJpYy15CiAJd3JhcHBl cnMsIGFuZCBub3QgaW5jbHVkZWQgaW4gZ2VuaGRyLXksIHRoZW4gZ2VuZXJhdGVkLXkgc3BlY2lm aWVzCmRpZmYgLS1naXQgYS9zY3JpcHRzL01ha2VmaWxlLmhlYWRlcnNpbnN0IGIvc2NyaXB0cy9N YWtlZmlsZS5oZWFkZXJzaW5zdAppbmRleCAzZTIwZDAzNDMyZDIuLjg3NmI0MmNmZWRlNCAxMDA2 NDQKLS0tIGEvc2NyaXB0cy9NYWtlZmlsZS5oZWFkZXJzaW5zdAorKysgYi9zY3JpcHRzL01ha2Vm aWxlLmhlYWRlcnNpbnN0CkBAIC0xNCw3ICsxNCw3IEBAIGtidWlsZC1maWxlIDo9ICQoc3JjdHJl ZSkvJChvYmopL0tidWlsZAogaW5jbHVkZSAkKGtidWlsZC1maWxlKQogCiAjIGNhbGxlZCBtYXkg c2V0IGRlc3RpbmF0aW9uIGRpciAod2hlbiBpbnN0YWxsaW5nIHRvIGFzbS8pCi1fZHN0IDo9ICQo aWYgJChkZXN0aW5hdGlvbi15KSwkKGRlc3RpbmF0aW9uLXkpLCQoaWYgJChkc3QpLCQoZHN0KSwk KG9iaikpKQorX2RzdCA6PSAkKGlmICQoZHN0KSwkKGRzdCksJChvYmopKQogCiBvbGQta2J1aWxk LWZpbGUgOj0gJChzcmN0cmVlKS8kKHN1YnN0IHVhcGkvLCwkKG9iaikpL0tidWlsZAogaWZuZXEg KCQod2lsZGNhcmQgJChvbGQta2J1aWxkLWZpbGUpKSwpCi0tIAoyLjguMQoKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxp c3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZl bAo= ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 6/7] Makefile.headersinst: remove destination-y option @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-06 9:43 ` Nicolas Dichtel ` (19 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 41 ++- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 4 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 59 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 482 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 39 +-- 81 files changed, 73 insertions(+), 1745 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..53e31061ff18 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 subdir-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1262,36 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. + +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. See subsequent chapter for the syntax of the Kbuild file. - --- 7.1 header-y + --- 7.1 subdir-y - header-y specifies header files to be exported. + subdir-y may be used to specify a subdirectory to be exported. Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..766455d0d291 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,5 +1,3 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += elf.h - generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y += - - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr-index.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..c13805d5a2a0 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +generic-y += auxvec.h +generic-y += bitsperlong.h +generic-y += byteorder.h +generic-y += errno.h +generic-y += fcntl.h +generic-y += ioctl.h +generic-y += ioctls.h +generic-y += ipcbuf.h +generic-y += mman.h +generic-y += msgbuf.h +generic-y += param.h +generic-y += poll.h +generic-y += posix_types.h +generic-y += ptrace.h +generic-y += resource.h +generic-y += sembuf.h +generic-y += setup.h +generic-y += shmbuf.h +generic-y += sigcontext.h +generic-y += siginfo.h +generic-y += signal.h +generic-y += socket.h +generic-y += sockios.h +generic-y += stat.h +generic-y += statfs.h +generic-y += swab.h +generic-y += termbits.h +generic-y += termios.h +generic-y += types.h +generic-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +generic-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index a8b93e685239..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,482 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..bb93f8466a35 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,18 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +26,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,26 +39,17 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) - # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) unwanted := $(filter-out $(all-files),$(oldheaders)) @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-06 9:43 ` Nicolas Dichtel ` (7 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 41 ++- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 4 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 59 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 482 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 39 +-- 81 files changed, 73 insertions(+), 1745 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..53e31061ff18 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass == 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 subdir-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1262,36 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. + +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. See subsequent chapter for the syntax of the Kbuild file. - --- 7.1 header-y + --- 7.1 subdir-y - header-y specifies header files to be exported. + subdir-y may be used to specify a subdirectory to be exported. Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..766455d0d291 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,5 +1,3 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += elf.h - generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y +- - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr-index.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..c13805d5a2a0 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +generic-y += auxvec.h +generic-y += bitsperlong.h +generic-y += byteorder.h +generic-y += errno.h +generic-y += fcntl.h +generic-y += ioctl.h +generic-y += ioctls.h +generic-y += ipcbuf.h +generic-y += mman.h +generic-y += msgbuf.h +generic-y += param.h +generic-y += poll.h +generic-y += posix_types.h +generic-y += ptrace.h +generic-y += resource.h +generic-y += sembuf.h +generic-y += setup.h +generic-y += shmbuf.h +generic-y += sigcontext.h +generic-y += siginfo.h +generic-y += signal.h +generic-y += socket.h +generic-y += sockios.h +generic-y += stat.h +generic-y += statfs.h +generic-y += swab.h +generic-y += termbits.h +generic-y += termios.h +generic-y += types.h +generic-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +generic-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index a8b93e685239..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,482 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..bb93f8466a35 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,18 @@ # ===================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ===================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +26,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,26 +39,17 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) - # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) unwanted := $(filter-out $(all-files),$(oldheaders)) @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-me Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 41 ++- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 4 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 59 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 482 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 39 +-- 81 files changed, 73 insertions(+), 1745 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..53e31061ff18 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass == 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 subdir-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1262,36 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. + +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. See subsequent chapter for the syntax of the Kbuild file. - --- 7.1 header-y + --- 7.1 subdir-y - header-y specifies header files to be exported. + subdir-y may be used to specify a subdirectory to be exported. Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..766455d0d291 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,5 +1,3 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += elf.h - generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y +- - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr-index.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..c13805d5a2a0 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +generic-y += auxvec.h +generic-y += bitsperlong.h +generic-y += byteorder.h +generic-y += errno.h +generic-y += fcntl.h +generic-y += ioctl.h +generic-y += ioctls.h +generic-y += ipcbuf.h +generic-y += mman.h +generic-y += msgbuf.h +generic-y += param.h +generic-y += poll.h +generic-y += posix_types.h +generic-y += ptrace.h +generic-y += resource.h +generic-y += sembuf.h +generic-y += setup.h +generic-y += shmbuf.h +generic-y += sigcontext.h +generic-y += siginfo.h +generic-y += signal.h +generic-y += socket.h +generic-y += sockios.h +generic-y += stat.h +generic-y += statfs.h +generic-y += swab.h +generic-y += termbits.h +generic-y += termios.h +generic-y += types.h +generic-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +generic-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index a8b93e685239..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,482 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..bb93f8466a35 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,18 @@ # ===================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ===================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +26,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,26 +39,17 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) - # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) unwanted := $(filter-out $(all-files),$(oldheaders)) @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: openrisc Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 41 ++- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 4 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 59 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 482 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 39 +-- 81 files changed, 73 insertions(+), 1745 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..53e31061ff18 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 subdir-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1262,36 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. + +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. See subsequent chapter for the syntax of the Kbuild file. - --- 7.1 header-y + --- 7.1 subdir-y - header-y specifies header files to be exported. + subdir-y may be used to specify a subdirectory to be exported. Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..766455d0d291 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,5 +1,3 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += elf.h - generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y += - - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr-index.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..c13805d5a2a0 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +generic-y += auxvec.h +generic-y += bitsperlong.h +generic-y += byteorder.h +generic-y += errno.h +generic-y += fcntl.h +generic-y += ioctl.h +generic-y += ioctls.h +generic-y += ipcbuf.h +generic-y += mman.h +generic-y += msgbuf.h +generic-y += param.h +generic-y += poll.h +generic-y += posix_types.h +generic-y += ptrace.h +generic-y += resource.h +generic-y += sembuf.h +generic-y += setup.h +generic-y += shmbuf.h +generic-y += sigcontext.h +generic-y += siginfo.h +generic-y += signal.h +generic-y += socket.h +generic-y += sockios.h +generic-y += stat.h +generic-y += statfs.h +generic-y += swab.h +generic-y += termbits.h +generic-y += termios.h +generic-y += types.h +generic-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +generic-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index a8b93e685239..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,482 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..bb93f8466a35 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,18 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +26,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,26 +39,17 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) - # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) unwanted := $(filter-out $(all-files),$(oldheaders)) @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: linux-arm-kernel Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 41 ++- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 4 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 59 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 482 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 39 +-- 81 files changed, 73 insertions(+), 1745 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..53e31061ff18 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 subdir-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1262,36 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. + +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. See subsequent chapter for the syntax of the Kbuild file. - --- 7.1 header-y + --- 7.1 subdir-y - header-y specifies header files to be exported. + subdir-y may be used to specify a subdirectory to be exported. Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..766455d0d291 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,5 +1,3 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += elf.h - generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y += - - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr-index.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..c13805d5a2a0 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +generic-y += auxvec.h +generic-y += bitsperlong.h +generic-y += byteorder.h +generic-y += errno.h +generic-y += fcntl.h +generic-y += ioctl.h +generic-y += ioctls.h +generic-y += ipcbuf.h +generic-y += mman.h +generic-y += msgbuf.h +generic-y += param.h +generic-y += poll.h +generic-y += posix_types.h +generic-y += ptrace.h +generic-y += resource.h +generic-y += sembuf.h +generic-y += setup.h +generic-y += shmbuf.h +generic-y += sigcontext.h +generic-y += siginfo.h +generic-y += signal.h +generic-y += socket.h +generic-y += sockios.h +generic-y += stat.h +generic-y += statfs.h +generic-y += swab.h +generic-y += termbits.h +generic-y += termios.h +generic-y += types.h +generic-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +generic-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index a8b93e685239..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,482 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..bb93f8466a35 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,18 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +26,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,26 +39,17 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) - # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) unwanted := $(filter-out $(all-files),$(oldheaders)) @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: linux-snps-arc Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h Thanks to Julien Floret <julien.floret at 6wind.com> for the tip to get all subdirs with a pure makefile command. Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> --- Documentation/kbuild/makefiles.txt | 41 ++- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 4 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 59 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 482 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 39 +-- 81 files changed, 73 insertions(+), 1745 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..53e31061ff18 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 subdir-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1262,36 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. + +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. See subsequent chapter for the syntax of the Kbuild file. - --- 7.1 header-y + --- 7.1 subdir-y - header-y specifies header files to be exported. + subdir-y may be used to specify a subdirectory to be exported. Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..766455d0d291 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,5 +1,3 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += elf.h - generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y += - - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr-index.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..c13805d5a2a0 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +generic-y += auxvec.h +generic-y += bitsperlong.h +generic-y += byteorder.h +generic-y += errno.h +generic-y += fcntl.h +generic-y += ioctl.h +generic-y += ioctls.h +generic-y += ipcbuf.h +generic-y += mman.h +generic-y += msgbuf.h +generic-y += param.h +generic-y += poll.h +generic-y += posix_types.h +generic-y += ptrace.h +generic-y += resource.h +generic-y += sembuf.h +generic-y += setup.h +generic-y += shmbuf.h +generic-y += sigcontext.h +generic-y += siginfo.h +generic-y += signal.h +generic-y += socket.h +generic-y += sockios.h +generic-y += stat.h +generic-y += statfs.h +generic-y += swab.h +generic-y += termbits.h +generic-y += termios.h +generic-y += types.h +generic-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +generic-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index a8b93e685239..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,482 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..bb93f8466a35 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,18 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +26,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,26 +39,17 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) - # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) unwanted := $(filter-out $(all-files),$(oldheaders)) @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, Nicolas Dichtel Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 41 ++- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 4 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 59 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 482 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 39 +-- 81 files changed, 73 insertions(+), 1745 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..53e31061ff18 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 subdir-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1262,36 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. + +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. See subsequent chapter for the syntax of the Kbuild file. - --- 7.1 header-y + --- 7.1 subdir-y - header-y specifies header files to be exported. + subdir-y may be used to specify a subdirectory to be exported. Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..766455d0d291 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,5 +1,3 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += elf.h - generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y += - - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr-index.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..c13805d5a2a0 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +generic-y += auxvec.h +generic-y += bitsperlong.h +generic-y += byteorder.h +generic-y += errno.h +generic-y += fcntl.h +generic-y += ioctl.h +generic-y += ioctls.h +generic-y += ipcbuf.h +generic-y += mman.h +generic-y += msgbuf.h +generic-y += param.h +generic-y += poll.h +generic-y += posix_types.h +generic-y += ptrace.h +generic-y += resource.h +generic-y += sembuf.h +generic-y += setup.h +generic-y += shmbuf.h +generic-y += sigcontext.h +generic-y += siginfo.h +generic-y += signal.h +generic-y += socket.h +generic-y += sockios.h +generic-y += stat.h +generic-y += statfs.h +generic-y += swab.h +generic-y += termbits.h +generic-y += termios.h +generic-y += types.h +generic-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +generic-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index a8b93e685239..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,482 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..bb93f8466a35 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,18 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +26,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,26 +39,17 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) - # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) unwanted := $(filter-out $(all-files),$(oldheaders)) @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-me Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 41 ++- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 4 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 59 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 482 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 39 +-- 81 files changed, 73 insertions(+), 1745 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..53e31061ff18 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 subdir-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1262,36 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. + +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. See subsequent chapter for the syntax of the Kbuild file. - --- 7.1 header-y + --- 7.1 subdir-y - header-y specifies header files to be exported. + subdir-y may be used to specify a subdirectory to be exported. Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..766455d0d291 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,5 +1,3 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += elf.h - generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y += - - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr-index.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..c13805d5a2a0 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +generic-y += auxvec.h +generic-y += bitsperlong.h +generic-y += byteorder.h +generic-y += errno.h +generic-y += fcntl.h +generic-y += ioctl.h +generic-y += ioctls.h +generic-y += ipcbuf.h +generic-y += mman.h +generic-y += msgbuf.h +generic-y += param.h +generic-y += poll.h +generic-y += posix_types.h +generic-y += ptrace.h +generic-y += resource.h +generic-y += sembuf.h +generic-y += setup.h +generic-y += shmbuf.h +generic-y += sigcontext.h +generic-y += siginfo.h +generic-y += signal.h +generic-y += socket.h +generic-y += sockios.h +generic-y += stat.h +generic-y += statfs.h +generic-y += swab.h +generic-y += termbits.h +generic-y += termios.h +generic-y += types.h +generic-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +generic-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index a8b93e685239..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,482 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..bb93f8466a35 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,18 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +26,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,26 +39,17 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) - # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) unwanted := $(filter-out $(all-files),$(oldheaders)) @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, Nicolas Dichtel Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 41 ++- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 4 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 59 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 482 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 39 +-- 81 files changed, 73 insertions(+), 1745 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..53e31061ff18 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 subdir-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1262,36 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. + +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. See subsequent chapter for the syntax of the Kbuild file. - --- 7.1 header-y + --- 7.1 subdir-y - header-y specifies header files to be exported. + subdir-y may be used to specify a subdirectory to be exported. Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..766455d0d291 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,5 +1,3 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += elf.h - generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y += - - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr-index.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..c13805d5a2a0 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +generic-y += auxvec.h +generic-y += bitsperlong.h +generic-y += byteorder.h +generic-y += errno.h +generic-y += fcntl.h +generic-y += ioctl.h +generic-y += ioctls.h +generic-y += ipcbuf.h +generic-y += mman.h +generic-y += msgbuf.h +generic-y += param.h +generic-y += poll.h +generic-y += posix_types.h +generic-y += ptrace.h +generic-y += resource.h +generic-y += sembuf.h +generic-y += setup.h +generic-y += shmbuf.h +generic-y += sigcontext.h +generic-y += siginfo.h +generic-y += signal.h +generic-y += socket.h +generic-y += sockios.h +generic-y += stat.h +generic-y += statfs.h +generic-y += swab.h +generic-y += termbits.h +generic-y += termios.h +generic-y += types.h +generic-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +generic-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index a8b93e685239..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,482 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..bb93f8466a35 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,18 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +26,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,26 +39,17 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) - # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) unwanted := $(filter-out $(all-files),$(oldheaders)) @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-me UmVndWxhcmx5LCB3aGVuIGEgbmV3IGhlYWRlciBpcyBjcmVhdGVkIGluIGluY2x1ZGUvdWFwaS8s IHRoZSBkZXZlbG9wZXIKZm9yZ2V0cyB0byBhZGQgaXQgaW4gdGhlIGNvcnJlc3BvbmRpbmcgS2J1 aWxkIGZpbGUuIFRoaXMgZXJyb3IgaXMgdXN1YWxseQpkZXRlY3RlZCBhZnRlciB0aGUgcmVsZWFz ZSBpcyBvdXQuCgpJbiBmYWN0LCBhbGwgaGVhZGVycyB1bmRlciB1YXBpIGRpcmVjdG9yaWVzIHNo b3VsZCBiZSBleHBvcnRlZCwgdGh1cyBpdCdzCnVzZWxlc3MgdG8gaGF2ZSBhbiBleGhhdXN0aXZl IGxpc3QuCgpBZnRlciB0aGlzIHBhdGNoLCB0aGUgZm9sbG93aW5nIGZpbGVzLCB3aGljaCB3ZXJl IG5vdCBleHBvcnRlZCwgYXJlIG5vdwpleHBvcnRlZCAod2l0aCBtYWtlIGhlYWRlcnNfaW5zdGFs bF9hbGwpOgphc20tdW5pY29yZTMyL3NobXBhcmFtLmgKYXNtLXVuaWNvcmUzMi91Y29udGV4dC5o CmFzbS1oZXhhZ29uL3NobXBhcmFtLmgKYXNtLW1pcHMvdWNvbnRleHQuaAphc20tbWlwcy9od2Nh cC5oCmFzbS1taXBzL3JlZy5oCmRybS92Z2VtX2RybS5oCmRybS9hcm1hZGFfZHJtLmgKZHJtL29t YXBfZHJtLmgKZHJtL2V0bmF2aXZfZHJtLmgKYXNtLXRpbGUvc2htcGFyYW0uaAphc20tYmxhY2tm aW4vc2htcGFyYW0uaAphc20tYmxhY2tmaW4vdWNvbnRleHQuaAphc20tcG93ZXJwYy9wZXJmX3Jl Z3MuaApyZG1hL3FlZHItYWJpLmgKYXNtLXBhcmlzYy9rdm1fcGFyYS5oCmFzbS1vcGVucmlzYy9z aG1wYXJhbS5oCmFzbS1uaW9zMi9rdm1fcGFyYS5oCmFzbS1uaW9zMi91Y29udGV4dC5oCmFzbS1z aC9rdm1fcGFyYS5oCmFzbS1zaC91Y29udGV4dC5oCmFzbS14dGVuc2Eva3ZtX3BhcmEuaAphc20t YXZyMzIva3ZtX3BhcmEuaAphc20tbTMyci9rdm1fcGFyYS5oCmFzbS1oODMwMC9zaG1wYXJhbS5o CmFzbS1oODMwMC91Y29udGV4dC5oCmFzbS1tZXRhZy9rdm1fcGFyYS5oCmFzbS1tZXRhZy9zaG1w YXJhbS5oCmFzbS1tZXRhZy91Y29udGV4dC5oCmFzbS1tNjhrL2t2bV9wYXJhLmgKYXNtLW02OGsv c2htcGFyYW0uaApsaW51eC9iY2FjaGUuaApsaW51eC9rdm0uaApsaW51eC9rdm1fcGFyYS5oCmxp bnV4L2tmZF9pb2N0bC5oCmxpbnV4L2NyeXB0b3VzZXIuaApsaW51eC9rY20uaApsaW51eC9rY292 LmgKbGludXgvc2VnNl9pcHR1bm5lbC5oCmxpbnV4L3N0bS5oCmxpbnV4L2dlbndxZQpsaW51eC9n ZW53cWUvLmluc3RhbGwKbGludXgvZ2Vud3FlL2dlbndxZV9jYXJkLmgKbGludXgvZ2Vud3FlLy4u aW5zdGFsbC5jbWQKbGludXgvc2VnNi5oCmxpbnV4L2NpZnMKbGludXgvY2lmcy8uaW5zdGFsbAps aW51eC9jaWZzL2NpZnNfbW91bnQuaApsaW51eC9jaWZzLy4uaW5zdGFsbC5jbWQKbGludXgvYXV0 b19kZXYtaW9jdGwuaAoKVGhhbmtzIHRvIEp1bGllbiBGbG9yZXQgPGp1bGllbi5mbG9yZXRANndp bmQuY29tPiBmb3IgdGhlIHRpcCB0byBnZXQgYWxsCnN1YmRpcnMgd2l0aCBhIHB1cmUgbWFrZWZp bGUgY29tbWFuZC4KClNpZ25lZC1vZmYtYnk6IE5pY29sYXMgRGljaHRlbCA8bmljb2xhcy5kaWNo dGVsQDZ3aW5kLmNvbT4KLS0tCiBEb2N1bWVudGF0aW9uL2tidWlsZC9tYWtlZmlsZXMudHh0ICAg ICAgICAgIHwgIDQxICsrLQogYXJjaC9hbHBoYS9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCAgICAg ICAgICB8ICA0MSAtLS0KIGFyY2gvYXJjL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkICAgICAgICAg ICAgfCAgIDMgLQogYXJjaC9hcm0vaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgICAgICAgICAgICB8 ICAxNyAtCiBhcmNoL2FybTY0L2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkICAgICAgICAgIHwgIDE4 IC0tCiBhcmNoL2F2cjMyL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkICAgICAgICAgIHwgIDIwIC0t CiBhcmNoL2JsYWNrZmluL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkICAgICAgIHwgIDE3IC0KIGFy Y2gvYzZ4L2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkICAgICAgICAgICAgfCAgIDggLQogYXJjaC9j cmlzL2luY2x1ZGUvdWFwaS9hcmNoLXYxMC9hcmNoL0tidWlsZCB8ICAgNSAtCiBhcmNoL2NyaXMv aW5jbHVkZS91YXBpL2FyY2gtdjMyL2FyY2gvS2J1aWxkIHwgICAzIC0KIGFyY2gvY3Jpcy9pbmNs dWRlL3VhcGkvYXNtL0tidWlsZCAgICAgICAgICAgfCAgNDMgKy0tCiBhcmNoL2Zydi9pbmNsdWRl L3VhcGkvYXNtL0tidWlsZCAgICAgICAgICAgIHwgIDMzIC0tCiBhcmNoL2g4MzAwL2luY2x1ZGUv dWFwaS9hc20vS2J1aWxkICAgICAgICAgIHwgIDI4IC0tCiBhcmNoL2hleGFnb24vaW5jbHVkZS9h c20vS2J1aWxkICAgICAgICAgICAgIHwgICAzIC0KIGFyY2gvaGV4YWdvbi9pbmNsdWRlL3VhcGkv YXNtL0tidWlsZCAgICAgICAgfCAgMTMgLQogYXJjaC9pYTY0L2luY2x1ZGUvdWFwaS9hc20vS2J1 aWxkICAgICAgICAgICB8ICA0NSAtLS0KIGFyY2gvbTMyci9pbmNsdWRlL3VhcGkvYXNtL0tidWls ZCAgICAgICAgICAgfCAgMzEgLS0KIGFyY2gvbTY4ay9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCAg ICAgICAgICAgfCAgMjQgLS0KIGFyY2gvbWV0YWcvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgICAg ICAgICAgfCAgIDggLQogYXJjaC9taWNyb2JsYXplL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkICAg ICB8ICAzMiAtLQogYXJjaC9taXBzL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkICAgICAgICAgICB8 ICAzNyAtLS0KIGFyY2gvbW4xMDMwMC9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCAgICAgICAgfCAg MzIgLS0KIGFyY2gvbmlvczIvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgICAgICAgICAgfCAgIDQg Ky0KIGFyY2gvb3BlbnJpc2MvaW5jbHVkZS9hc20vS2J1aWxkICAgICAgICAgICAgfCAgIDMgLQog YXJjaC9vcGVucmlzYy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCAgICAgICB8ICAgOCAtCiBhcmNo L3BhcmlzYy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCAgICAgICAgIHwgIDI4IC0tCiBhcmNoL3Bv d2VycGMvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgICAgICAgIHwgIDQ1IC0tLQogYXJjaC9zMzkw L2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkICAgICAgICAgICB8ICA1MiAtLS0KIGFyY2gvc2NvcmUv aW5jbHVkZS9hc20vS2J1aWxkICAgICAgICAgICAgICAgfCAgIDQgLQogYXJjaC9zY29yZS9pbmNs dWRlL3VhcGkvYXNtL0tidWlsZCAgICAgICAgICB8ICAzMiAtLQogYXJjaC9zaC9pbmNsdWRlL3Vh cGkvYXNtL0tidWlsZCAgICAgICAgICAgICB8ICAyMyAtLQogYXJjaC9zcGFyYy9pbmNsdWRlL3Vh cGkvYXNtL0tidWlsZCAgICAgICAgICB8ICA0OCAtLS0KIGFyY2gvdGlsZS9pbmNsdWRlL2FzbS9L YnVpbGQgICAgICAgICAgICAgICAgfCAgIDMgLQogYXJjaC90aWxlL2luY2x1ZGUvdWFwaS9hcmNo L0tidWlsZCAgICAgICAgICB8ICAxNyAtCiBhcmNoL3RpbGUvaW5jbHVkZS91YXBpL2FzbS9LYnVp bGQgICAgICAgICAgIHwgIDE5ICstCiBhcmNoL3VuaWNvcmUzMi9pbmNsdWRlL3VhcGkvYXNtL0ti dWlsZCAgICAgIHwgICA2IC0KIGFyY2gveDg2L2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkICAgICAg ICAgICAgfCAgNTkgLS0tLQogYXJjaC94dGVuc2EvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgICAg ICAgICB8ICAyMyAtLQogaW5jbHVkZS9LYnVpbGQgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB8ICAgMiAtCiBpbmNsdWRlL2FzbS1nZW5lcmljL0tidWlsZC5hc20gICAgICAgICAgICAgIHwg ICAxIC0KIGluY2x1ZGUvc2NzaS9mYy9LYnVpbGQgICAgICAgICAgICAgICAgICAgICAgfCAgIDAK IGluY2x1ZGUvdWFwaS9LYnVpbGQgICAgICAgICAgICAgICAgICAgICAgICAgfCAgMTUgLQogaW5j bHVkZS91YXBpL2FzbS1nZW5lcmljL0tidWlsZCAgICAgICAgICAgICB8ICAzNiAtLS0KIGluY2x1 ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVpbGQuYXNtICAgICAgICAgfCAgNjIgKystLQogaW5jbHVk ZS91YXBpL2RybS9LYnVpbGQgICAgICAgICAgICAgICAgICAgICB8ICAyMiAtLQogaW5jbHVkZS91 YXBpL2xpbnV4L0tidWlsZCAgICAgICAgICAgICAgICAgICB8IDQ4MiAtLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiBpbmNsdWRlL3VhcGkvbGludXgvYW5kcm9pZC9LYnVpbGQgICAgICAgICAg IHwgICAyIC0KIGluY2x1ZGUvdWFwaS9saW51eC9ieXRlb3JkZXIvS2J1aWxkICAgICAgICAgfCAg IDMgLQogaW5jbHVkZS91YXBpL2xpbnV4L2NhaWYvS2J1aWxkICAgICAgICAgICAgICB8ICAgMyAt CiBpbmNsdWRlL3VhcGkvbGludXgvY2FuL0tidWlsZCAgICAgICAgICAgICAgIHwgICA2IC0KIGlu Y2x1ZGUvdWFwaS9saW51eC9kdmIvS2J1aWxkICAgICAgICAgICAgICAgfCAgIDkgLQogaW5jbHVk ZS91YXBpL2xpbnV4L2hkbGMvS2J1aWxkICAgICAgICAgICAgICB8ICAgMiAtCiBpbmNsdWRlL3Vh cGkvbGludXgvaHNpL0tidWlsZCAgICAgICAgICAgICAgIHwgICAyIC0KIGluY2x1ZGUvdWFwaS9s aW51eC9paW8vS2J1aWxkICAgICAgICAgICAgICAgfCAgIDMgLQogaW5jbHVkZS91YXBpL2xpbnV4 L2lzZG4vS2J1aWxkICAgICAgICAgICAgICB8ICAgMiAtCiBpbmNsdWRlL3VhcGkvbGludXgvbW1j L0tidWlsZCAgICAgICAgICAgICAgIHwgICAyIC0KIGluY2x1ZGUvdWFwaS9saW51eC9uZXRmaWx0 ZXIvS2J1aWxkICAgICAgICAgfCAgODkgLS0tLS0KIGluY2x1ZGUvdWFwaS9saW51eC9uZXRmaWx0 ZXIvaXBzZXQvS2J1aWxkICAgfCAgIDUgLQogaW5jbHVkZS91YXBpL2xpbnV4L25ldGZpbHRlcl9h cnAvS2J1aWxkICAgICB8ICAgMyAtCiBpbmNsdWRlL3VhcGkvbGludXgvbmV0ZmlsdGVyX2JyaWRn ZS9LYnVpbGQgIHwgIDE4IC0tCiBpbmNsdWRlL3VhcGkvbGludXgvbmV0ZmlsdGVyX2lwdjQvS2J1 aWxkICAgIHwgIDEwIC0KIGluY2x1ZGUvdWFwaS9saW51eC9uZXRmaWx0ZXJfaXB2Ni9LYnVpbGQg ICAgfCAgMTMgLQogaW5jbHVkZS91YXBpL2xpbnV4L25mc2QvS2J1aWxkICAgICAgICAgICAgICB8 ICAgNiAtCiBpbmNsdWRlL3VhcGkvbGludXgvcmFpZC9LYnVpbGQgICAgICAgICAgICAgIHwgICAz IC0KIGluY2x1ZGUvdWFwaS9saW51eC9zcGkvS2J1aWxkICAgICAgICAgICAgICAgfCAgIDIgLQog aW5jbHVkZS91YXBpL2xpbnV4L3N1bnJwYy9LYnVpbGQgICAgICAgICAgICB8ICAgMiAtCiBpbmNs dWRlL3VhcGkvbGludXgvdGNfYWN0L0tidWlsZCAgICAgICAgICAgIHwgIDE1IC0KIGluY2x1ZGUv dWFwaS9saW51eC90Y19lbWF0Y2gvS2J1aWxkICAgICAgICAgfCAgIDUgLQogaW5jbHVkZS91YXBp L2xpbnV4L3VzYi9LYnVpbGQgICAgICAgICAgICAgICB8ICAxMiAtCiBpbmNsdWRlL3VhcGkvbGlu dXgvd2ltYXgvS2J1aWxkICAgICAgICAgICAgIHwgICAyIC0KIGluY2x1ZGUvdWFwaS9taXNjL0ti dWlsZCAgICAgICAgICAgICAgICAgICAgfCAgIDIgLQogaW5jbHVkZS91YXBpL210ZC9LYnVpbGQg ICAgICAgICAgICAgICAgICAgICB8ICAgNiAtCiBpbmNsdWRlL3VhcGkvcmRtYS9LYnVpbGQgICAg ICAgICAgICAgICAgICAgIHwgIDE4IC0tCiBpbmNsdWRlL3VhcGkvcmRtYS9oZmkvS2J1aWxkICAg ICAgICAgICAgICAgIHwgICAyIC0KIGluY2x1ZGUvdWFwaS9zY3NpL0tidWlsZCAgICAgICAgICAg ICAgICAgICAgfCAgIDYgLQogaW5jbHVkZS91YXBpL3Njc2kvZmMvS2J1aWxkICAgICAgICAgICAg ICAgICB8ICAgNSAtCiBpbmNsdWRlL3VhcGkvc291bmQvS2J1aWxkICAgICAgICAgICAgICAgICAg IHwgIDE2IC0KIGluY2x1ZGUvdWFwaS92aWRlby9LYnVpbGQgICAgICAgICAgICAgICAgICAgfCAg IDQgLQogaW5jbHVkZS91YXBpL3hlbi9LYnVpbGQgICAgICAgICAgICAgICAgICAgICB8ICAgNSAt CiBpbmNsdWRlL3ZpZGVvL0tidWlsZCAgICAgICAgICAgICAgICAgICAgICAgIHwgICAwCiBzY3Jp cHRzL01ha2VmaWxlLmhlYWRlcnNpbnN0ICAgICAgICAgICAgICAgIHwgIDM5ICstLQogODEgZmls ZXMgY2hhbmdlZCwgNzMgaW5zZXJ0aW9ucygrKSwgMTc0NSBkZWxldGlvbnMoLSkKIGRlbGV0ZSBt b2RlIDEwMDY0NCBhcmNoL2NyaXMvaW5jbHVkZS91YXBpL2FyY2gtdjEwL2FyY2gvS2J1aWxkCiBk ZWxldGUgbW9kZSAxMDA2NDQgYXJjaC9jcmlzL2luY2x1ZGUvdWFwaS9hcmNoLXYzMi9hcmNoL0ti dWlsZAogZGVsZXRlIG1vZGUgMTAwNjQ0IGFyY2gvdGlsZS9pbmNsdWRlL3VhcGkvYXJjaC9LYnVp bGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL0tidWlsZAogZGVsZXRlIG1vZGUgMTAwNjQ0 IGluY2x1ZGUvYXNtLWdlbmVyaWMvS2J1aWxkLmFzbQogZGVsZXRlIG1vZGUgMTAwNjQ0IGluY2x1 ZGUvc2NzaS9mYy9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL3VhcGkvS2J1aWxk CiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS91YXBpL2FzbS1nZW5lcmljL0tidWlsZAogZGVs ZXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUvdWFwaS9kcm0vS2J1aWxkCiBkZWxldGUgbW9kZSAxMDA2 NDQgaW5jbHVkZS91YXBpL2xpbnV4L0tidWlsZAogZGVsZXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUv dWFwaS9saW51eC9hbmRyb2lkL0tidWlsZAogZGVsZXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUvdWFw aS9saW51eC9ieXRlb3JkZXIvS2J1aWxkCiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS91YXBp L2xpbnV4L2NhaWYvS2J1aWxkCiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS91YXBpL2xpbnV4 L2Nhbi9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL3VhcGkvbGludXgvZHZiL0ti dWlsZAogZGVsZXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUvdWFwaS9saW51eC9oZGxjL0tidWlsZAog ZGVsZXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUvdWFwaS9saW51eC9oc2kvS2J1aWxkCiBkZWxldGUg bW9kZSAxMDA2NDQgaW5jbHVkZS91YXBpL2xpbnV4L2lpby9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEw MDY0NCBpbmNsdWRlL3VhcGkvbGludXgvaXNkbi9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBp bmNsdWRlL3VhcGkvbGludXgvbW1jL0tidWlsZAogZGVsZXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUv dWFwaS9saW51eC9uZXRmaWx0ZXIvS2J1aWxkCiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS91 YXBpL2xpbnV4L25ldGZpbHRlci9pcHNldC9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBpbmNs dWRlL3VhcGkvbGludXgvbmV0ZmlsdGVyX2FycC9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBp bmNsdWRlL3VhcGkvbGludXgvbmV0ZmlsdGVyX2JyaWRnZS9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEw MDY0NCBpbmNsdWRlL3VhcGkvbGludXgvbmV0ZmlsdGVyX2lwdjQvS2J1aWxkCiBkZWxldGUgbW9k ZSAxMDA2NDQgaW5jbHVkZS91YXBpL2xpbnV4L25ldGZpbHRlcl9pcHY2L0tidWlsZAogZGVsZXRl IG1vZGUgMTAwNjQ0IGluY2x1ZGUvdWFwaS9saW51eC9uZnNkL0tidWlsZAogZGVsZXRlIG1vZGUg MTAwNjQ0IGluY2x1ZGUvdWFwaS9saW51eC9yYWlkL0tidWlsZAogZGVsZXRlIG1vZGUgMTAwNjQ0 IGluY2x1ZGUvdWFwaS9saW51eC9zcGkvS2J1aWxkCiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVk ZS91YXBpL2xpbnV4L3N1bnJwYy9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL3Vh cGkvbGludXgvdGNfYWN0L0tidWlsZAogZGVsZXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUvdWFwaS9s aW51eC90Y19lbWF0Y2gvS2J1aWxkCiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS91YXBpL2xp bnV4L3VzYi9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL3VhcGkvbGludXgvd2lt YXgvS2J1aWxkCiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS91YXBpL21pc2MvS2J1aWxkCiBk ZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS91YXBpL210ZC9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEw MDY0NCBpbmNsdWRlL3VhcGkvcmRtYS9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBpbmNsdWRl L3VhcGkvcmRtYS9oZmkvS2J1aWxkCiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS91YXBpL3Nj c2kvS2J1aWxkCiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS91YXBpL3Njc2kvZmMvS2J1aWxk CiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS91YXBpL3NvdW5kL0tidWlsZAogZGVsZXRlIG1v ZGUgMTAwNjQ0IGluY2x1ZGUvdWFwaS92aWRlby9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBp bmNsdWRlL3VhcGkveGVuL0tidWlsZAogZGVsZXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUvdmlkZW8v S2J1aWxkCgpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9rYnVpbGQvbWFrZWZpbGVzLnR4dCBi L0RvY3VtZW50YXRpb24va2J1aWxkL21ha2VmaWxlcy50eHQKaW5kZXggMzdiNTI1ZDMyOWFlLi41 M2UzMTA2MWZmMTggMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24va2J1aWxkL21ha2VmaWxlcy50 eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9rYnVpbGQvbWFrZWZpbGVzLnR4dApAQCAtNDQsNyArNDQs NyBAQCBUaGlzIGRvY3VtZW50IGRlc2NyaWJlcyB0aGUgTGludXgga2VybmVsIE1ha2VmaWxlcy4K IAkgICAtLS0gNi4xMSBQb3N0LWxpbmsgcGFzcwogCiAJPT09IDcgS2J1aWxkIHN5bnRheCBmb3Ig ZXhwb3J0ZWQgaGVhZGVycwotCQktLS0gNy4xIGhlYWRlci15CisJCS0tLSA3LjEgc3ViZGlyLXkK IAkJLS0tIDcuMiBnZW5oZHIteQogCQktLS0gNy4zIGdlbmVyaWMteQogCQktLS0gNy40IGdlbmVy YXRlZC15CkBAIC0xMjM1LDcgKzEyMzUsNyBAQCBXaGVuIGtidWlsZCBleGVjdXRlcywgdGhlIGZv bGxvd2luZyBzdGVwcyBhcmUgZm9sbG93ZWQgKHJvdWdobHkpOgogCXRoYXQgbWF5IGJlIHNoYXJl ZCBiZXR3ZWVuIGluZGl2aWR1YWwgYXJjaGl0ZWN0dXJlcy4KIAlUaGUgcmVjb21tZW5kZWQgYXBw cm9hY2ggaG93IHRvIHVzZSBhIGdlbmVyaWMgaGVhZGVyIGZpbGUgaXMKIAl0byBsaXN0IHRoZSBm aWxlIGluIHRoZSBLYnVpbGQgZmlsZS4KLQlTZWUgIjcuNCBnZW5lcmljLXkiIGZvciBmdXJ0aGVy IGluZm8gb24gc3ludGF4IGV0Yy4KKwlTZWUgIjcuMyBnZW5lcmljLXkiIGZvciBmdXJ0aGVyIGlu Zm8gb24gc3ludGF4IGV0Yy4KIAogLS0tIDYuMTEgUG9zdC1saW5rIHBhc3MKIApAQCAtMTI2Miwz NyArMTI2MiwzNiBAQCBUaGUgcHJlLXByb2Nlc3NpbmcgZG9lczoKIC0gZHJvcCBpbmNsdWRlIG9m IGNvbXBpbGVyLmgKIC0gZHJvcCBhbGwgc2VjdGlvbnMgdGhhdCBhcmUga2VybmVsIGludGVybmFs IChndWFyZGVkIGJ5IGlmZGVmIF9fS0VSTkVMX18pCiAKLUVhY2ggcmVsZXZhbnQgZGlyZWN0b3J5 IGNvbnRhaW5zIGEgZmlsZSBuYW1lICJLYnVpbGQiIHdoaWNoIHNwZWNpZmllcyB0aGUKLWhlYWRl cnMgdG8gYmUgZXhwb3J0ZWQuCitBbGwgaGVhZGVycyB1bmRlciBpbmNsdWRlL3VhcGkvLCBpbmNs dWRlL2dlbmVyYXRlZC91YXBpLywKK2FyY2gvPGFyY2g+L2luY2x1ZGUvdWFwaS9hc20vIGFuZCBh cmNoLzxhcmNoPi9pbmNsdWRlL2dlbmVyYXRlZC91YXBpL2FzbS8KK2FyZSBleHBvcnRlZC4KKwor QSBLYnVpbGQgZmlsZSBtYXkgYmUgZGVmaW5lZCB1bmRlciBhcmNoLzxhcmNoPi9pbmNsdWRlL3Vh cGkvYXNtLyBhbmQKK2FyY2gvPGFyY2g+L2luY2x1ZGUvYXNtLyB0byBsaXN0IGFzbSBmaWxlcyBj b21pbmcgZnJvbSBhc20tZ2VuZXJpYy4KIFNlZSBzdWJzZXF1ZW50IGNoYXB0ZXIgZm9yIHRoZSBz eW50YXggb2YgdGhlIEtidWlsZCBmaWxlLgogCi0JLS0tIDcuMSBoZWFkZXIteQorCS0tLSA3LjEg c3ViZGlyLXkKIAotCWhlYWRlci15IHNwZWNpZmllcyBoZWFkZXIgZmlsZXMgdG8gYmUgZXhwb3J0 ZWQuCisJc3ViZGlyLXkgbWF5IGJlIHVzZWQgdG8gc3BlY2lmeSBhIHN1YmRpcmVjdG9yeSB0byBi ZSBleHBvcnRlZC4KIAogCQlFeGFtcGxlOgotCQkJI2luY2x1ZGUvbGludXgvS2J1aWxkCi0JCQlo ZWFkZXIteSArPSB1c2IvCi0JCQloZWFkZXIteSArPSBhaW9fYWJpLmgKKwkJCSNhcmNoL2NyaXMv aW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKKwkJCXN1YmRpci15ICs9IC4uL2FyY2gtdjEwL2FyY2gv CisJCQlzdWJkaXIteSArPSAuLi9hcmNoLXYzMi9hcmNoLwogCi0JVGhlIGNvbnZlbnRpb24gaXMg dG8gbGlzdCBvbmUgZmlsZSBwZXIgbGluZSBhbmQKKwlUaGUgY29udmVudGlvbiBpcyB0byBsaXN0 IG9uZSBzdWJkaXIgcGVyIGxpbmUgYW5kCiAJcHJlZmVyYWJseSBpbiBhbHBoYWJldGljIG9yZGVy LgogCi0JaGVhZGVyLXkgYWxzbyBzcGVjaWZpZXMgd2hpY2ggc3ViZGlyZWN0b3JpZXMgdG8gdmlz aXQuCi0JQSBzdWJkaXJlY3RvcnkgaXMgaWRlbnRpZmllZCBieSBhIHRyYWlsaW5nICcvJyB3aGlj aAotCWNhbiBiZSBzZWVuIGluIHRoZSBleGFtcGxlIGFib3ZlIGZvciB0aGUgdXNiIHN1YmRpcmVj dG9yeS4KLQotCVN1YmRpcmVjdG9yaWVzIGFyZSB2aXNpdGVkIGJlZm9yZSB0aGVpciBwYXJlbnQg ZGlyZWN0b3JpZXMuCi0KIAktLS0gNy4yIGdlbmhkci15CiAKLQlnZW5oZHIteSBzcGVjaWZpZXMg Z2VuZXJhdGVkIGZpbGVzIHRvIGJlIGV4cG9ydGVkLgotCUdlbmVyYXRlZCBmaWxlcyBhcmUgc3Bl Y2lhbCBhcyB0aGV5IG5lZWQgdG8gYmUgbG9va2VkCi0JdXAgaW4gYW5vdGhlciBkaXJlY3Rvcnkg d2hlbiBkb2luZyAnbWFrZSBPPS4uLicgYnVpbGRzLgorCWdlbmhkci15IHNwZWNpZmllcyBhc20g ZmlsZXMgdG8gYmUgZ2VuZXJhdGVkLgogCiAJCUV4YW1wbGU6Ci0JCQkjaW5jbHVkZS9saW51eC9L YnVpbGQKLQkJCWdlbmhkci15ICs9IHZlcnNpb24uaAorCQkJI2FyY2gveDg2L2luY2x1ZGUvdWFw aS9hc20vS2J1aWxkCisJCQlnZW5oZHIteSArPSB1bmlzdGRfMzIuaAorCQkJZ2VuaGRyLXkgKz0g dW5pc3RkXzY0LmgKKwkJCWdlbmhkci15ICs9IHVuaXN0ZF94MzIuaAorCiAKIAktLS0gNy4zIGdl bmVyaWMteQogCmRpZmYgLS1naXQgYS9hcmNoL2FscGhhL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxk IGIvYXJjaC9hbHBoYS9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAppbmRleCBkOTZmMmVmNWI2Mzku LmIxNWJmNmJjMGU5NCAxMDA2NDQKLS0tIGEvYXJjaC9hbHBoYS9pbmNsdWRlL3VhcGkvYXNtL0ti dWlsZAorKysgYi9hcmNoL2FscGhhL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCkBAIC0xLDQzICsx LDIgQEAKICMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKIGluY2x1ZGUgaW5jbHVkZS91YXBpL2Fz bS1nZW5lcmljL0tidWlsZC5hc20KLQotaGVhZGVyLXkgKz0gYS5vdXQuaAotaGVhZGVyLXkgKz0g YXV4dmVjLmgKLWhlYWRlci15ICs9IGJpdHNwZXJsb25nLmgKLWhlYWRlci15ICs9IGJ5dGVvcmRl ci5oCi1oZWFkZXIteSArPSBjb21waWxlci5oCi1oZWFkZXIteSArPSBjb25zb2xlLmgKLWhlYWRl ci15ICs9IGVycm5vLmgKLWhlYWRlci15ICs9IGZjbnRsLmgKLWhlYWRlci15ICs9IGZwdS5oCi1o ZWFkZXIteSArPSBnZW50cmFwLmgKLWhlYWRlci15ICs9IGlvY3RsLmgKLWhlYWRlci15ICs9IGlv Y3Rscy5oCi1oZWFkZXIteSArPSBpcGNidWYuaAotaGVhZGVyLXkgKz0ga3ZtX3BhcmEuaAotaGVh ZGVyLXkgKz0gbW1hbi5oCi1oZWFkZXIteSArPSBtc2didWYuaAotaGVhZGVyLXkgKz0gcGFsLmgK LWhlYWRlci15ICs9IHBhcmFtLmgKLWhlYWRlci15ICs9IHBvbGwuaAotaGVhZGVyLXkgKz0gcG9z aXhfdHlwZXMuaAotaGVhZGVyLXkgKz0gcHRyYWNlLmgKLWhlYWRlci15ICs9IHJlZy5oCi1oZWFk ZXIteSArPSByZWdkZWYuaAotaGVhZGVyLXkgKz0gcmVzb3VyY2UuaAotaGVhZGVyLXkgKz0gc2Vt YnVmLmgKLWhlYWRlci15ICs9IHNldHVwLmgKLWhlYWRlci15ICs9IHNobWJ1Zi5oCi1oZWFkZXIt eSArPSBzaWdjb250ZXh0LmgKLWhlYWRlci15ICs9IHNpZ2luZm8uaAotaGVhZGVyLXkgKz0gc2ln bmFsLmgKLWhlYWRlci15ICs9IHNvY2tldC5oCi1oZWFkZXIteSArPSBzb2NraW9zLmgKLWhlYWRl ci15ICs9IHN0YXQuaAotaGVhZGVyLXkgKz0gc3RhdGZzLmgKLWhlYWRlci15ICs9IHN3YWIuaAot aGVhZGVyLXkgKz0gc3lzaW5mby5oCi1oZWFkZXIteSArPSB0ZXJtYml0cy5oCi1oZWFkZXIteSAr PSB0ZXJtaW9zLmgKLWhlYWRlci15ICs9IHR5cGVzLmgKLWhlYWRlci15ICs9IHVuaXN0ZC5oCmRp ZmYgLS1naXQgYS9hcmNoL2FyYy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCBiL2FyY2gvYXJjL2lu Y2x1ZGUvdWFwaS9hc20vS2J1aWxkCmluZGV4IGY1MGQwMmRmNzhkNS4uYjE1YmY2YmMwZTk0IDEw MDY0NAotLS0gYS9hcmNoL2FyYy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAorKysgYi9hcmNoL2Fy Yy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZApAQCAtMSw1ICsxLDIgQEAKICMgVUFQSSBIZWFkZXIg ZXhwb3J0IGxpc3QKIGluY2x1ZGUgaW5jbHVkZS91YXBpL2FzbS1nZW5lcmljL0tidWlsZC5hc20K LWhlYWRlci15ICs9IGVsZi5oCi1oZWFkZXIteSArPSBwYWdlLmgKLWhlYWRlci15ICs9IGNhY2hl Y3RsLmgKZGlmZiAtLWdpdCBhL2FyY2gvYXJtL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkIGIvYXJj aC9hcm0vaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKaW5kZXggNDZhNzZjZDZhY2I2Li42MDdmNzAy YzJkNjIgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCisrKyBi L2FyY2gvYXJtL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCkBAIC0xLDIzICsxLDYgQEAKICMgVUFQ SSBIZWFkZXIgZXhwb3J0IGxpc3QKIGluY2x1ZGUgaW5jbHVkZS91YXBpL2FzbS1nZW5lcmljL0ti dWlsZC5hc20KIAotaGVhZGVyLXkgKz0gYXV4dmVjLmgKLWhlYWRlci15ICs9IGJ5dGVvcmRlci5o Ci1oZWFkZXIteSArPSBmY250bC5oCi1oZWFkZXIteSArPSBod2NhcC5oCi1oZWFkZXIteSArPSBp b2N0bHMuaAotaGVhZGVyLXkgKz0ga3ZtX3BhcmEuaAotaGVhZGVyLXkgKz0gbW1hbi5oCi1oZWFk ZXIteSArPSBwZXJmX3JlZ3MuaAotaGVhZGVyLXkgKz0gcG9zaXhfdHlwZXMuaAotaGVhZGVyLXkg Kz0gcHRyYWNlLmgKLWhlYWRlci15ICs9IHNldHVwLmgKLWhlYWRlci15ICs9IHNpZ2NvbnRleHQu aAotaGVhZGVyLXkgKz0gc2lnbmFsLmgKLWhlYWRlci15ICs9IHN0YXQuaAotaGVhZGVyLXkgKz0g c3RhdGZzLmgKLWhlYWRlci15ICs9IHN3YWIuaAotaGVhZGVyLXkgKz0gdW5pc3RkLmgKIGdlbmhk ci15ICs9IHVuaXN0ZC1jb21tb24uaAogZ2VuaGRyLXkgKz0gdW5pc3RkLW9hYmkuaAogZ2VuaGRy LXkgKz0gdW5pc3RkLWVhYmkuaApkaWZmIC0tZ2l0IGEvYXJjaC9hcm02NC9pbmNsdWRlL3VhcGkv YXNtL0tidWlsZCBiL2FyY2gvYXJtNjQvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKaW5kZXggODI1 YjBmZTUxYzJiLi4xM2E5N2FhMjI4NWYgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtNjQvaW5jbHVkZS91 YXBpL2FzbS9LYnVpbGQKKysrIGIvYXJjaC9hcm02NC9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZApA QCAtMiwyMSArMiwzIEBACiBpbmNsdWRlIGluY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVpbGQu YXNtCiAKIGdlbmVyaWMteSArPSBrdm1fcGFyYS5oCi0KLWhlYWRlci15ICs9IGF1eHZlYy5oCi1o ZWFkZXIteSArPSBiaXRzcGVybG9uZy5oCi1oZWFkZXIteSArPSBieXRlb3JkZXIuaAotaGVhZGVy LXkgKz0gZmNudGwuaAotaGVhZGVyLXkgKz0gaHdjYXAuaAotaGVhZGVyLXkgKz0ga3ZtX3BhcmEu aAotaGVhZGVyLXkgKz0gcGVyZl9yZWdzLmgKLWhlYWRlci15ICs9IHBhcmFtLmgKLWhlYWRlci15 ICs9IHB0cmFjZS5oCi1oZWFkZXIteSArPSBzZXR1cC5oCi1oZWFkZXIteSArPSBzaWdjb250ZXh0 LmgKLWhlYWRlci15ICs9IHNpZ2luZm8uaAotaGVhZGVyLXkgKz0gc2lnbmFsLmgKLWhlYWRlci15 ICs9IHN0YXQuaAotaGVhZGVyLXkgKz0gc3RhdGZzLmgKLWhlYWRlci15ICs9IHVjb250ZXh0LmgK LWhlYWRlci15ICs9IHVuaXN0ZC5oCmRpZmYgLS1naXQgYS9hcmNoL2F2cjMyL2luY2x1ZGUvdWFw aS9hc20vS2J1aWxkIGIvYXJjaC9hdnIzMi9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAppbmRleCAw OGQ4YTNkNzZlYTguLjYxMDM5NTA4MzM2NCAxMDA2NDQKLS0tIGEvYXJjaC9hdnIzMi9pbmNsdWRl L3VhcGkvYXNtL0tidWlsZAorKysgYi9hcmNoL2F2cjMyL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxk CkBAIC0xLDI2ICsxLDYgQEAKICMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKIGluY2x1ZGUgaW5j bHVkZS91YXBpL2FzbS1nZW5lcmljL0tidWlsZC5hc20KIAotaGVhZGVyLXkgKz0gYXV4dmVjLmgK LWhlYWRlci15ICs9IGJ5dGVvcmRlci5oCi1oZWFkZXIteSArPSBjYWNoZWN0bC5oCi1oZWFkZXIt eSArPSBtc2didWYuaAotaGVhZGVyLXkgKz0gcGFyYW0uaAotaGVhZGVyLXkgKz0gcG9zaXhfdHlw ZXMuaAotaGVhZGVyLXkgKz0gcHRyYWNlLmgKLWhlYWRlci15ICs9IHNlbWJ1Zi5oCi1oZWFkZXIt eSArPSBzZXR1cC5oCi1oZWFkZXIteSArPSBzaG1idWYuaAotaGVhZGVyLXkgKz0gc2lnY29udGV4 dC5oCi1oZWFkZXIteSArPSBzaWduYWwuaAotaGVhZGVyLXkgKz0gc29ja2V0LmgKLWhlYWRlci15 ICs9IHNvY2tpb3MuaAotaGVhZGVyLXkgKz0gc3RhdC5oCi1oZWFkZXIteSArPSBzd2FiLmgKLWhl YWRlci15ICs9IHRlcm1iaXRzLmgKLWhlYWRlci15ICs9IHRlcm1pb3MuaAotaGVhZGVyLXkgKz0g dHlwZXMuaAotaGVhZGVyLXkgKz0gdW5pc3RkLmgKIGdlbmVyaWMteSArPSBiaXRzcGVybG9uZy5o CiBnZW5lcmljLXkgKz0gZXJybm8uaAogZ2VuZXJpYy15ICs9IGZjbnRsLmgKZGlmZiAtLWdpdCBh L2FyY2gvYmxhY2tmaW4vaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgYi9hcmNoL2JsYWNrZmluL2lu Y2x1ZGUvdWFwaS9hc20vS2J1aWxkCmluZGV4IDBiZDI4Zjc3YWJjMy4uYjE1YmY2YmMwZTk0IDEw MDY0NAotLS0gYS9hcmNoL2JsYWNrZmluL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCisrKyBiL2Fy Y2gvYmxhY2tmaW4vaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKQEAgLTEsMTkgKzEsMiBAQAogIyBV QVBJIEhlYWRlciBleHBvcnQgbGlzdAogaW5jbHVkZSBpbmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMv S2J1aWxkLmFzbQotCi1oZWFkZXIteSArPSBiZmluX3Nwb3J0LmgKLWhlYWRlci15ICs9IGJ5dGVv cmRlci5oCi1oZWFkZXIteSArPSBjYWNoZWN0bC5oCi1oZWFkZXIteSArPSBmY250bC5oCi1oZWFk ZXIteSArPSBmaXhlZF9jb2RlLmgKLWhlYWRlci15ICs9IGlvY3Rscy5oCi1oZWFkZXIteSArPSBr dm1fcGFyYS5oCi1oZWFkZXIteSArPSBwb2xsLmgKLWhlYWRlci15ICs9IHBvc2l4X3R5cGVzLmgK LWhlYWRlci15ICs9IHB0cmFjZS5oCi1oZWFkZXIteSArPSBzaWdjb250ZXh0LmgKLWhlYWRlci15 ICs9IHNpZ2luZm8uaAotaGVhZGVyLXkgKz0gc2lnbmFsLmgKLWhlYWRlci15ICs9IHN0YXQuaAot aGVhZGVyLXkgKz0gc3dhYi5oCi1oZWFkZXIteSArPSB1bmlzdGQuaApkaWZmIC0tZ2l0IGEvYXJj aC9jNngvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgYi9hcmNoL2M2eC9pbmNsdWRlL3VhcGkvYXNt L0tidWlsZAppbmRleCBlOWJjMmIyYjgxNDcuLjEzYTk3YWEyMjg1ZiAxMDA2NDQKLS0tIGEvYXJj aC9jNngvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKKysrIGIvYXJjaC9jNngvaW5jbHVkZS91YXBp L2FzbS9LYnVpbGQKQEAgLTIsMTEgKzIsMyBAQAogaW5jbHVkZSBpbmNsdWRlL3VhcGkvYXNtLWdl bmVyaWMvS2J1aWxkLmFzbQogCiBnZW5lcmljLXkgKz0ga3ZtX3BhcmEuaAotCi1oZWFkZXIteSAr PSBieXRlb3JkZXIuaAotaGVhZGVyLXkgKz0ga3ZtX3BhcmEuaAotaGVhZGVyLXkgKz0gcHRyYWNl LmgKLWhlYWRlci15ICs9IHNldHVwLmgKLWhlYWRlci15ICs9IHNpZ2NvbnRleHQuaAotaGVhZGVy LXkgKz0gc3dhYi5oCi1oZWFkZXIteSArPSB1bmlzdGQuaApkaWZmIC0tZ2l0IGEvYXJjaC9jcmlz L2luY2x1ZGUvdWFwaS9hcmNoLXYxMC9hcmNoL0tidWlsZCBiL2FyY2gvY3Jpcy9pbmNsdWRlL3Vh cGkvYXJjaC12MTAvYXJjaC9LYnVpbGQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDkw NDhjODdhNzgyYi4uMDAwMDAwMDAwMDAwCi0tLSBhL2FyY2gvY3Jpcy9pbmNsdWRlL3VhcGkvYXJj aC12MTAvYXJjaC9LYnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSw1ICswLDAgQEAKLSMgVUFQSSBI ZWFkZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IHN2X2FkZHIuYWdoCi1oZWFkZXIteSArPSBz dl9hZGRyX2FnLmgKLWhlYWRlci15ICs9IHN2aW50by5oCi1oZWFkZXIteSArPSB1c2VyLmgKZGlm ZiAtLWdpdCBhL2FyY2gvY3Jpcy9pbmNsdWRlL3VhcGkvYXJjaC12MzIvYXJjaC9LYnVpbGQgYi9h cmNoL2NyaXMvaW5jbHVkZS91YXBpL2FyY2gtdjMyL2FyY2gvS2J1aWxkCmRlbGV0ZWQgZmlsZSBt b2RlIDEwMDY0NAppbmRleCA1OWVmZmZkMTZiNjEuLjAwMDAwMDAwMDAwMAotLS0gYS9hcmNoL2Ny aXMvaW5jbHVkZS91YXBpL2FyY2gtdjMyL2FyY2gvS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEs MyArMCwwIEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBjcnlwdG9j b3AuaAotaGVhZGVyLXkgKz0gdXNlci5oCmRpZmYgLS1naXQgYS9hcmNoL2NyaXMvaW5jbHVkZS91 YXBpL2FzbS9LYnVpbGQgYi9hcmNoL2NyaXMvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKaW5kZXgg ZDU1NjRhMGFlNjZhLi5kMGM1NDcxODU2ZTAgMTAwNjQ0Ci0tLSBhL2FyY2gvY3Jpcy9pbmNsdWRl L3VhcGkvYXNtL0tidWlsZAorKysgYi9hcmNoL2NyaXMvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQK QEAgLTEsNDQgKzEsNSBAQAogIyBVQVBJIEhlYWRlciBleHBvcnQgbGlzdAogaW5jbHVkZSBpbmNs dWRlL3VhcGkvYXNtLWdlbmVyaWMvS2J1aWxkLmFzbQogCi1oZWFkZXIteSArPSAuLi9hcmNoLXYx MC9hcmNoLwotaGVhZGVyLXkgKz0gLi4vYXJjaC12MzIvYXJjaC8KLWhlYWRlci15ICs9IGF1eHZl Yy5oCi1oZWFkZXIteSArPSBiaXRzcGVybG9uZy5oCi1oZWFkZXIteSArPSBieXRlb3JkZXIuaAot aGVhZGVyLXkgKz0gZWxmLmgKLWhlYWRlci15ICs9IGVsZl92MTAuaAotaGVhZGVyLXkgKz0gZWxm X3YzMi5oCi1oZWFkZXIteSArPSBlcnJuby5oCi1oZWFkZXIteSArPSBldGhlcm5ldC5oCi1oZWFk ZXIteSArPSBldHJheGdwaW8uaAotaGVhZGVyLXkgKz0gZmNudGwuaAotaGVhZGVyLXkgKz0gaW9j dGwuaAotaGVhZGVyLXkgKz0gaW9jdGxzLmgKLWhlYWRlci15ICs9IGlwY2J1Zi5oCi1oZWFkZXIt eSArPSBtbWFuLmgKLWhlYWRlci15ICs9IG1zZ2J1Zi5oCi1oZWFkZXIteSArPSBwYXJhbS5oCi1o ZWFkZXIteSArPSBwb2xsLmgKLWhlYWRlci15ICs9IHBvc2l4X3R5cGVzLmgKLWhlYWRlci15ICs9 IHB0cmFjZS5oCi1oZWFkZXIteSArPSBwdHJhY2VfdjEwLmgKLWhlYWRlci15ICs9IHB0cmFjZV92 MzIuaAotaGVhZGVyLXkgKz0gcmVzb3VyY2UuaAotaGVhZGVyLXkgKz0gcnM0ODUuaAotaGVhZGVy LXkgKz0gc2VtYnVmLmgKLWhlYWRlci15ICs9IHNldHVwLmgKLWhlYWRlci15ICs9IHNobWJ1Zi5o Ci1oZWFkZXIteSArPSBzaWdjb250ZXh0LmgKLWhlYWRlci15ICs9IHNpZ2luZm8uaAotaGVhZGVy LXkgKz0gc2lnbmFsLmgKLWhlYWRlci15ICs9IHNvY2tldC5oCi1oZWFkZXIteSArPSBzb2NraW9z LmgKLWhlYWRlci15ICs9IHN0YXQuaAotaGVhZGVyLXkgKz0gc3RhdGZzLmgKLWhlYWRlci15ICs9 IHN3YWIuaAotaGVhZGVyLXkgKz0gc3luY19zZXJpYWwuaAotaGVhZGVyLXkgKz0gdGVybWJpdHMu aAotaGVhZGVyLXkgKz0gdGVybWlvcy5oCi1oZWFkZXIteSArPSB0eXBlcy5oCi1oZWFkZXIteSAr PSB1bmlzdGQuaAorc3ViZGlyLXkgKz0gLi4vYXJjaC12MTAvYXJjaC8KK3N1YmRpci15ICs9IC4u L2FyY2gtdjMyL2FyY2gvCmRpZmYgLS1naXQgYS9hcmNoL2Zydi9pbmNsdWRlL3VhcGkvYXNtL0ti dWlsZCBiL2FyY2gvZnJ2L2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCmluZGV4IDQyYTJiMzM0NjFj MC4uYjE1YmY2YmMwZTk0IDEwMDY0NAotLS0gYS9hcmNoL2Zydi9pbmNsdWRlL3VhcGkvYXNtL0ti dWlsZAorKysgYi9hcmNoL2Zydi9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZApAQCAtMSwzNSArMSwy IEBACiAjIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0CiBpbmNsdWRlIGluY2x1ZGUvdWFwaS9hc20t Z2VuZXJpYy9LYnVpbGQuYXNtCi0KLWhlYWRlci15ICs9IGF1eHZlYy5oCi1oZWFkZXIteSArPSBi aXRzcGVybG9uZy5oCi1oZWFkZXIteSArPSBieXRlb3JkZXIuaAotaGVhZGVyLXkgKz0gZXJybm8u aAotaGVhZGVyLXkgKz0gZmNudGwuaAotaGVhZGVyLXkgKz0gaW9jdGwuaAotaGVhZGVyLXkgKz0g aW9jdGxzLmgKLWhlYWRlci15ICs9IGlwY2J1Zi5oCi1oZWFkZXIteSArPSBrdm1fcGFyYS5oCi1o ZWFkZXIteSArPSBtbWFuLmgKLWhlYWRlci15ICs9IG1zZ2J1Zi5oCi1oZWFkZXIteSArPSBwYXJh bS5oCi1oZWFkZXIteSArPSBwb2xsLmgKLWhlYWRlci15ICs9IHBvc2l4X3R5cGVzLmgKLWhlYWRl ci15ICs9IHB0cmFjZS5oCi1oZWFkZXIteSArPSByZWdpc3RlcnMuaAotaGVhZGVyLXkgKz0gcmVz b3VyY2UuaAotaGVhZGVyLXkgKz0gc2VtYnVmLmgKLWhlYWRlci15ICs9IHNldHVwLmgKLWhlYWRl ci15ICs9IHNobWJ1Zi5oCi1oZWFkZXIteSArPSBzaWdjb250ZXh0LmgKLWhlYWRlci15ICs9IHNp Z2luZm8uaAotaGVhZGVyLXkgKz0gc2lnbmFsLmgKLWhlYWRlci15ICs9IHNvY2tldC5oCi1oZWFk ZXIteSArPSBzb2NraW9zLmgKLWhlYWRlci15ICs9IHN0YXQuaAotaGVhZGVyLXkgKz0gc3RhdGZz LmgKLWhlYWRlci15ICs9IHN3YWIuaAotaGVhZGVyLXkgKz0gdGVybWJpdHMuaAotaGVhZGVyLXkg Kz0gdGVybWlvcy5oCi1oZWFkZXIteSArPSB0eXBlcy5oCi1oZWFkZXIteSArPSB1bmlzdGQuaApk aWZmIC0tZ2l0IGEvYXJjaC9oODMwMC9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCBiL2FyY2gvaDgz MDAvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKaW5kZXggZmI2MTAxYTVkNGYxLi5iMTViZjZiYzBl OTQgMTAwNjQ0Ci0tLSBhL2FyY2gvaDgzMDAvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKKysrIGIv YXJjaC9oODMwMC9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZApAQCAtMSwzMCArMSwyIEBACiAjIFVB UEkgSGVhZGVyIGV4cG9ydCBsaXN0CiBpbmNsdWRlIGluY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9L YnVpbGQuYXNtCi0KLWhlYWRlci15ICs9IGF1eHZlYy5oCi1oZWFkZXIteSArPSBiaXRzcGVybG9u Zy5oCi1oZWFkZXIteSArPSBlcnJuby5oCi1oZWFkZXIteSArPSBmY250bC5oCi1oZWFkZXIteSAr PSBpb2N0bC5oCi1oZWFkZXIteSArPSBpb2N0bHMuaAotaGVhZGVyLXkgKz0gaXBjYnVmLmgKLWhl YWRlci15ICs9IGt2bV9wYXJhLmgKLWhlYWRlci15ICs9IG1tYW4uaAotaGVhZGVyLXkgKz0gbXNn YnVmLmgKLWhlYWRlci15ICs9IHBhcmFtLmgKLWhlYWRlci15ICs9IHBvbGwuaAotaGVhZGVyLXkg Kz0gcG9zaXhfdHlwZXMuaAotaGVhZGVyLXkgKz0gcmVzb3VyY2UuaAotaGVhZGVyLXkgKz0gc2Vt YnVmLmgKLWhlYWRlci15ICs9IHNldHVwLmgKLWhlYWRlci15ICs9IHNobWJ1Zi5oCi1oZWFkZXIt eSArPSBzaWdpbmZvLmgKLWhlYWRlci15ICs9IHNvY2tldC5oCi1oZWFkZXIteSArPSBzb2NraW9z LmgKLWhlYWRlci15ICs9IHN0YXQuaAotaGVhZGVyLXkgKz0gc3RhdGZzLmgKLWhlYWRlci15ICs9 IHN3YWIuaAotaGVhZGVyLXkgKz0gdGVybWJpdHMuaAotaGVhZGVyLXkgKz0gdGVybWlvcy5oCi1o ZWFkZXIteSArPSB0eXBlcy5oCi1oZWFkZXIteSArPSB1bmlzdGQuaApkaWZmIC0tZ2l0IGEvYXJj aC9oZXhhZ29uL2luY2x1ZGUvYXNtL0tidWlsZCBiL2FyY2gvaGV4YWdvbi9pbmNsdWRlL2FzbS9L YnVpbGQKaW5kZXggZGI4ZGRhYmM2YmQyLi5mM2IxY2ViNWMxZTQgMTAwNjQ0Ci0tLSBhL2FyY2gv aGV4YWdvbi9pbmNsdWRlL2FzbS9LYnVpbGQKKysrIGIvYXJjaC9oZXhhZ29uL2luY2x1ZGUvYXNt L0tidWlsZApAQCAtMSw2ICsxLDMgQEAKLQotaGVhZGVyLXkgKz0gdWNvbnRleHQuaAotCiBnZW5l cmljLXkgKz0gYXV4dmVjLmgKIGdlbmVyaWMteSArPSBiYXJyaWVyLmgKIGdlbmVyaWMteSArPSBi dWcuaApkaWZmIC0tZ2l0IGEvYXJjaC9oZXhhZ29uL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkIGIv YXJjaC9oZXhhZ29uL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCmluZGV4IGMzMTcwNmMzODYzMS4u YjE1YmY2YmMwZTk0IDEwMDY0NAotLS0gYS9hcmNoL2hleGFnb24vaW5jbHVkZS91YXBpL2FzbS9L YnVpbGQKKysrIGIvYXJjaC9oZXhhZ29uL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCkBAIC0xLDE1 ICsxLDIgQEAKICMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKIGluY2x1ZGUgaW5jbHVkZS91YXBp L2FzbS1nZW5lcmljL0tidWlsZC5hc20KLQotaGVhZGVyLXkgKz0gYml0c3BlcmxvbmcuaAotaGVh ZGVyLXkgKz0gYnl0ZW9yZGVyLmgKLWhlYWRlci15ICs9IGt2bV9wYXJhLmgKLWhlYWRlci15ICs9 IHBhcmFtLmgKLWhlYWRlci15ICs9IHB0cmFjZS5oCi1oZWFkZXIteSArPSByZWdpc3RlcnMuaAot aGVhZGVyLXkgKz0gc2V0dXAuaAotaGVhZGVyLXkgKz0gc2lnY29udGV4dC5oCi1oZWFkZXIteSAr PSBzaWduYWwuaAotaGVhZGVyLXkgKz0gc3dhYi5oCi1oZWFkZXIteSArPSB1bmlzdGQuaAotaGVh ZGVyLXkgKz0gdXNlci5oCmRpZmYgLS1naXQgYS9hcmNoL2lhNjQvaW5jbHVkZS91YXBpL2FzbS9L YnVpbGQgYi9hcmNoL2lhNjQvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKaW5kZXggODkxMDAyYmJi OTk1Li4xM2E5N2FhMjI4NWYgMTAwNjQ0Ci0tLSBhL2FyY2gvaWE2NC9pbmNsdWRlL3VhcGkvYXNt L0tidWlsZAorKysgYi9hcmNoL2lhNjQvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKQEAgLTIsNDgg KzIsMyBAQAogaW5jbHVkZSBpbmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMvS2J1aWxkLmFzbQogCiBn ZW5lcmljLXkgKz0ga3ZtX3BhcmEuaAotCi1oZWFkZXIteSArPSBhdXh2ZWMuaAotaGVhZGVyLXkg Kz0gYml0c3BlcmxvbmcuaAotaGVhZGVyLXkgKz0gYnJlYWsuaAotaGVhZGVyLXkgKz0gYnl0ZW9y ZGVyLmgKLWhlYWRlci15ICs9IGNtcHhjaGcuaAotaGVhZGVyLXkgKz0gZXJybm8uaAotaGVhZGVy LXkgKz0gZmNudGwuaAotaGVhZGVyLXkgKz0gZnB1LmgKLWhlYWRlci15ICs9IGdjY19pbnRyaW4u aAotaGVhZGVyLXkgKz0gaWE2NHJlZ3MuaAotaGVhZGVyLXkgKz0gaW50ZWxfaW50cmluLmgKLWhl YWRlci15ICs9IGludHJpbnNpY3MuaAotaGVhZGVyLXkgKz0gaW9jdGwuaAotaGVhZGVyLXkgKz0g aW9jdGxzLmgKLWhlYWRlci15ICs9IGlwY2J1Zi5oCi1oZWFkZXIteSArPSBrdm1fcGFyYS5oCi1o ZWFkZXIteSArPSBtbWFuLmgKLWhlYWRlci15ICs9IG1zZ2J1Zi5oCi1oZWFkZXIteSArPSBwYXJh bS5oCi1oZWFkZXIteSArPSBwZXJmbW9uLmgKLWhlYWRlci15ICs9IHBlcmZtb25fZGVmYXVsdF9z bXBsLmgKLWhlYWRlci15ICs9IHBvbGwuaAotaGVhZGVyLXkgKz0gcG9zaXhfdHlwZXMuaAotaGVh ZGVyLXkgKz0gcHRyYWNlLmgKLWhlYWRlci15ICs9IHB0cmFjZV9vZmZzZXRzLmgKLWhlYWRlci15 ICs9IHJlc291cmNlLmgKLWhlYWRlci15ICs9IHJzZS5oCi1oZWFkZXIteSArPSBzZW1idWYuaAot aGVhZGVyLXkgKz0gc2V0dXAuaAotaGVhZGVyLXkgKz0gc2htYnVmLmgKLWhlYWRlci15ICs9IHNp Z2NvbnRleHQuaAotaGVhZGVyLXkgKz0gc2lnaW5mby5oCi1oZWFkZXIteSArPSBzaWduYWwuaAot aGVhZGVyLXkgKz0gc29ja2V0LmgKLWhlYWRlci15ICs9IHNvY2tpb3MuaAotaGVhZGVyLXkgKz0g c3RhdC5oCi1oZWFkZXIteSArPSBzdGF0ZnMuaAotaGVhZGVyLXkgKz0gc3dhYi5oCi1oZWFkZXIt eSArPSB0ZXJtYml0cy5oCi1oZWFkZXIteSArPSB0ZXJtaW9zLmgKLWhlYWRlci15ICs9IHR5cGVz LmgKLWhlYWRlci15ICs9IHVjb250ZXh0LmgKLWhlYWRlci15ICs9IHVuaXN0ZC5oCi1oZWFkZXIt eSArPSB1c3RhY2suaApkaWZmIC0tZ2l0IGEvYXJjaC9tMzJyL2luY2x1ZGUvdWFwaS9hc20vS2J1 aWxkIGIvYXJjaC9tMzJyL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCmluZGV4IDQzOTM3YTYxZDZj Zi4uYjE1YmY2YmMwZTk0IDEwMDY0NAotLS0gYS9hcmNoL20zMnIvaW5jbHVkZS91YXBpL2FzbS9L YnVpbGQKKysrIGIvYXJjaC9tMzJyL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCkBAIC0xLDMzICsx LDIgQEAKICMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKIGluY2x1ZGUgaW5jbHVkZS91YXBpL2Fz bS1nZW5lcmljL0tidWlsZC5hc20KLQotaGVhZGVyLXkgKz0gYXV4dmVjLmgKLWhlYWRlci15ICs9 IGJpdHNwZXJsb25nLmgKLWhlYWRlci15ICs9IGJ5dGVvcmRlci5oCi1oZWFkZXIteSArPSBlcnJu by5oCi1oZWFkZXIteSArPSBmY250bC5oCi1oZWFkZXIteSArPSBpb2N0bC5oCi1oZWFkZXIteSAr PSBpb2N0bHMuaAotaGVhZGVyLXkgKz0gaXBjYnVmLmgKLWhlYWRlci15ICs9IG1tYW4uaAotaGVh ZGVyLXkgKz0gbXNnYnVmLmgKLWhlYWRlci15ICs9IHBhcmFtLmgKLWhlYWRlci15ICs9IHBvbGwu aAotaGVhZGVyLXkgKz0gcG9zaXhfdHlwZXMuaAotaGVhZGVyLXkgKz0gcHRyYWNlLmgKLWhlYWRl ci15ICs9IHJlc291cmNlLmgKLWhlYWRlci15ICs9IHNlbWJ1Zi5oCi1oZWFkZXIteSArPSBzZXR1 cC5oCi1oZWFkZXIteSArPSBzaG1idWYuaAotaGVhZGVyLXkgKz0gc2lnY29udGV4dC5oCi1oZWFk ZXIteSArPSBzaWdpbmZvLmgKLWhlYWRlci15ICs9IHNpZ25hbC5oCi1oZWFkZXIteSArPSBzb2Nr ZXQuaAotaGVhZGVyLXkgKz0gc29ja2lvcy5oCi1oZWFkZXIteSArPSBzdGF0LmgKLWhlYWRlci15 ICs9IHN0YXRmcy5oCi1oZWFkZXIteSArPSBzd2FiLmgKLWhlYWRlci15ICs9IHRlcm1iaXRzLmgK LWhlYWRlci15ICs9IHRlcm1pb3MuaAotaGVhZGVyLXkgKz0gdHlwZXMuaAotaGVhZGVyLXkgKz0g dW5pc3RkLmgKZGlmZiAtLWdpdCBhL2FyY2gvbTY4ay9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCBi L2FyY2gvbTY4ay9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAppbmRleCA2YTJkMjU3YmRmYjIuLjY0 MzY4MDc3MjM1YSAxMDA2NDQKLS0tIGEvYXJjaC9tNjhrL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxk CisrKyBiL2FyY2gvbTY4ay9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZApAQCAtOSwyNyArOSwzIEBA IGdlbmVyaWMteSArPSBzb2NrZXQuaAogZ2VuZXJpYy15ICs9IHNvY2tpb3MuaAogZ2VuZXJpYy15 ICs9IHRlcm1iaXRzLmgKIGdlbmVyaWMteSArPSB0ZXJtaW9zLmgKLQotaGVhZGVyLXkgKz0gYS5v dXQuaAotaGVhZGVyLXkgKz0gYm9vdGluZm8uaAotaGVhZGVyLXkgKz0gYm9vdGluZm8tYW1pZ2Eu aAotaGVhZGVyLXkgKz0gYm9vdGluZm8tYXBvbGxvLmgKLWhlYWRlci15ICs9IGJvb3RpbmZvLWF0 YXJpLmgKLWhlYWRlci15ICs9IGJvb3RpbmZvLWhwMzAwLmgKLWhlYWRlci15ICs9IGJvb3RpbmZv LW1hYy5oCi1oZWFkZXIteSArPSBib290aW5mby1xNDAuaAotaGVhZGVyLXkgKz0gYm9vdGluZm8t dm1lLmgKLWhlYWRlci15ICs9IGJ5dGVvcmRlci5oCi1oZWFkZXIteSArPSBjYWNoZWN0bC5oCi1o ZWFkZXIteSArPSBmY250bC5oCi1oZWFkZXIteSArPSBpb2N0bHMuaAotaGVhZGVyLXkgKz0gcGFy YW0uaAotaGVhZGVyLXkgKz0gcG9sbC5oCi1oZWFkZXIteSArPSBwb3NpeF90eXBlcy5oCi1oZWFk ZXIteSArPSBwdHJhY2UuaAotaGVhZGVyLXkgKz0gc2V0dXAuaAotaGVhZGVyLXkgKz0gc2lnY29u dGV4dC5oCi1oZWFkZXIteSArPSBzaWduYWwuaAotaGVhZGVyLXkgKz0gc3RhdC5oCi1oZWFkZXIt eSArPSBzd2FiLmgKLWhlYWRlci15ICs9IHVuaXN0ZC5oCmRpZmYgLS1naXQgYS9hcmNoL21ldGFn L2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkIGIvYXJjaC9tZXRhZy9pbmNsdWRlL3VhcGkvYXNtL0ti dWlsZAppbmRleCBhYjc4YmUyYjZlYjAuLmIyOTczMWViZDdhOSAxMDA2NDQKLS0tIGEvYXJjaC9t ZXRhZy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAorKysgYi9hcmNoL21ldGFnL2luY2x1ZGUvdWFw aS9hc20vS2J1aWxkCkBAIC0xLDE0ICsxLDYgQEAKICMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QK IGluY2x1ZGUgaW5jbHVkZS91YXBpL2FzbS1nZW5lcmljL0tidWlsZC5hc20KIAotaGVhZGVyLXkg Kz0gYnl0ZW9yZGVyLmgKLWhlYWRlci15ICs9IGVjaC5oCi1oZWFkZXIteSArPSBwdHJhY2UuaAot aGVhZGVyLXkgKz0gc2lnY29udGV4dC5oCi1oZWFkZXIteSArPSBzaWdpbmZvLmgKLWhlYWRlci15 ICs9IHN3YWIuaAotaGVhZGVyLXkgKz0gdW5pc3RkLmgKLQogZ2VuZXJpYy15ICs9IG1tYW4uaAog Z2VuZXJpYy15ICs9IHJlc291cmNlLmgKIGdlbmVyaWMteSArPSBzZXR1cC5oCmRpZmYgLS1naXQg YS9hcmNoL21pY3JvYmxhemUvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgYi9hcmNoL21pY3JvYmxh emUvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKaW5kZXggMWFhYzk5Zjg3ZGYxLi4yMTc4Yzc4Yzdj MWEgMTAwNjQ0Ci0tLSBhL2FyY2gvbWljcm9ibGF6ZS9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAor KysgYi9hcmNoL21pY3JvYmxhemUvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKQEAgLTIsMzUgKzIs MyBAQAogaW5jbHVkZSBpbmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMvS2J1aWxkLmFzbQogCiBnZW5l cmljLXkgKz0gdHlwZXMuaAotCi1oZWFkZXIteSArPSBhdXh2ZWMuaAotaGVhZGVyLXkgKz0gYml0 c3BlcmxvbmcuaAotaGVhZGVyLXkgKz0gYnl0ZW9yZGVyLmgKLWhlYWRlci15ICs9IGVsZi5oCi1o ZWFkZXIteSArPSBlcnJuby5oCi1oZWFkZXIteSArPSBmY250bC5oCi1oZWFkZXIteSArPSBpb2N0 bC5oCi1oZWFkZXIteSArPSBpb2N0bHMuaAotaGVhZGVyLXkgKz0gaXBjYnVmLmgKLWhlYWRlci15 ICs9IGt2bV9wYXJhLmgKLWhlYWRlci15ICs9IG1tYW4uaAotaGVhZGVyLXkgKz0gbXNnYnVmLmgK LWhlYWRlci15ICs9IHBhcmFtLmgKLWhlYWRlci15ICs9IHBvbGwuaAotaGVhZGVyLXkgKz0gcG9z aXhfdHlwZXMuaAotaGVhZGVyLXkgKz0gcHRyYWNlLmgKLWhlYWRlci15ICs9IHJlc291cmNlLmgK LWhlYWRlci15ICs9IHNlbWJ1Zi5oCi1oZWFkZXIteSArPSBzZXR1cC5oCi1oZWFkZXIteSArPSBz aG1idWYuaAotaGVhZGVyLXkgKz0gc2lnY29udGV4dC5oCi1oZWFkZXIteSArPSBzaWdpbmZvLmgK LWhlYWRlci15ICs9IHNpZ25hbC5oCi1oZWFkZXIteSArPSBzb2NrZXQuaAotaGVhZGVyLXkgKz0g c29ja2lvcy5oCi1oZWFkZXIteSArPSBzdGF0LmgKLWhlYWRlci15ICs9IHN0YXRmcy5oCi1oZWFk ZXIteSArPSBzd2FiLmgKLWhlYWRlci15ICs9IHRlcm1iaXRzLmgKLWhlYWRlci15ICs9IHRlcm1p b3MuaAotaGVhZGVyLXkgKz0gdW5pc3RkLmgKZGlmZiAtLWdpdCBhL2FyY2gvbWlwcy9pbmNsdWRl L3VhcGkvYXNtL0tidWlsZCBiL2FyY2gvbWlwcy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAppbmRl eCBmMmNmNDE0NjExNDYuLmEwMjY2ZmViYTllNiAxMDA2NDQKLS0tIGEvYXJjaC9taXBzL2luY2x1 ZGUvdWFwaS9hc20vS2J1aWxkCisrKyBiL2FyY2gvbWlwcy9pbmNsdWRlL3VhcGkvYXNtL0tidWls ZApAQCAtMiw0MCArMiwzIEBACiBpbmNsdWRlIGluY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVp bGQuYXNtCiAKIGdlbmVyaWMteSArPSBpcGNidWYuaAotCi1oZWFkZXIteSArPSBhdXh2ZWMuaAot aGVhZGVyLXkgKz0gYml0ZmllbGQuaAotaGVhZGVyLXkgKz0gYml0c3BlcmxvbmcuaAotaGVhZGVy LXkgKz0gYnJlYWsuaAotaGVhZGVyLXkgKz0gYnl0ZW9yZGVyLmgKLWhlYWRlci15ICs9IGNhY2hl Y3RsLmgKLWhlYWRlci15ICs9IGVycm5vLmgKLWhlYWRlci15ICs9IGZjbnRsLmgKLWhlYWRlci15 ICs9IGluc3QuaAotaGVhZGVyLXkgKz0gaW9jdGwuaAotaGVhZGVyLXkgKz0gaW9jdGxzLmgKLWhl YWRlci15ICs9IGt2bV9wYXJhLmgKLWhlYWRlci15ICs9IG1tYW4uaAotaGVhZGVyLXkgKz0gbXNn YnVmLmgKLWhlYWRlci15ICs9IHBhcmFtLmgKLWhlYWRlci15ICs9IHBvbGwuaAotaGVhZGVyLXkg Kz0gcG9zaXhfdHlwZXMuaAotaGVhZGVyLXkgKz0gcHRyYWNlLmgKLWhlYWRlci15ICs9IHJlc291 cmNlLmgKLWhlYWRlci15ICs9IHNlbWJ1Zi5oCi1oZWFkZXIteSArPSBzZXR1cC5oCi1oZWFkZXIt eSArPSBzZ2lkZWZzLmgKLWhlYWRlci15ICs9IHNobWJ1Zi5oCi1oZWFkZXIteSArPSBzaWdjb250 ZXh0LmgKLWhlYWRlci15ICs9IHNpZ2luZm8uaAotaGVhZGVyLXkgKz0gc2lnbmFsLmgKLWhlYWRl ci15ICs9IHNvY2tldC5oCi1oZWFkZXIteSArPSBzb2NraW9zLmgKLWhlYWRlci15ICs9IHN0YXQu aAotaGVhZGVyLXkgKz0gc3RhdGZzLmgKLWhlYWRlci15ICs9IHN3YWIuaAotaGVhZGVyLXkgKz0g c3lzbWlwcy5oCi1oZWFkZXIteSArPSB0ZXJtYml0cy5oCi1oZWFkZXIteSArPSB0ZXJtaW9zLmgK LWhlYWRlci15ICs9IHR5cGVzLmgKLWhlYWRlci15ICs9IHVuaXN0ZC5oCmRpZmYgLS1naXQgYS9h cmNoL21uMTAzMDAvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgYi9hcmNoL21uMTAzMDAvaW5jbHVk ZS91YXBpL2FzbS9LYnVpbGQKaW5kZXggMDQwMTc4Y2RiM2ViLi5iMTViZjZiYzBlOTQgMTAwNjQ0 Ci0tLSBhL2FyY2gvbW4xMDMwMC9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAorKysgYi9hcmNoL21u MTAzMDAvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKQEAgLTEsMzQgKzEsMiBAQAogIyBVQVBJIEhl YWRlciBleHBvcnQgbGlzdAogaW5jbHVkZSBpbmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMvS2J1aWxk LmFzbQotCi1oZWFkZXIteSArPSBhdXh2ZWMuaAotaGVhZGVyLXkgKz0gYml0c3BlcmxvbmcuaAot aGVhZGVyLXkgKz0gYnl0ZW9yZGVyLmgKLWhlYWRlci15ICs9IGVycm5vLmgKLWhlYWRlci15ICs9 IGZjbnRsLmgKLWhlYWRlci15ICs9IGlvY3RsLmgKLWhlYWRlci15ICs9IGlvY3Rscy5oCi1oZWFk ZXIteSArPSBpcGNidWYuaAotaGVhZGVyLXkgKz0ga3ZtX3BhcmEuaAotaGVhZGVyLXkgKz0gbW1h bi5oCi1oZWFkZXIteSArPSBtc2didWYuaAotaGVhZGVyLXkgKz0gcGFyYW0uaAotaGVhZGVyLXkg Kz0gcG9sbC5oCi1oZWFkZXIteSArPSBwb3NpeF90eXBlcy5oCi1oZWFkZXIteSArPSBwdHJhY2Uu aAotaGVhZGVyLXkgKz0gcmVzb3VyY2UuaAotaGVhZGVyLXkgKz0gc2VtYnVmLmgKLWhlYWRlci15 ICs9IHNldHVwLmgKLWhlYWRlci15ICs9IHNobWJ1Zi5oCi1oZWFkZXIteSArPSBzaWdjb250ZXh0 LmgKLWhlYWRlci15ICs9IHNpZ2luZm8uaAotaGVhZGVyLXkgKz0gc2lnbmFsLmgKLWhlYWRlci15 ICs9IHNvY2tldC5oCi1oZWFkZXIteSArPSBzb2NraW9zLmgKLWhlYWRlci15ICs9IHN0YXQuaAot aGVhZGVyLXkgKz0gc3RhdGZzLmgKLWhlYWRlci15ICs9IHN3YWIuaAotaGVhZGVyLXkgKz0gdGVy bWJpdHMuaAotaGVhZGVyLXkgKz0gdGVybWlvcy5oCi1oZWFkZXIteSArPSB0eXBlcy5oCi1oZWFk ZXIteSArPSB1bmlzdGQuaApkaWZmIC0tZ2l0IGEvYXJjaC9uaW9zMi9pbmNsdWRlL3VhcGkvYXNt L0tidWlsZCBiL2FyY2gvbmlvczIvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKaW5kZXggZTBiYjk3 MmE1MGQ3Li43NjY0NTVkMGQyOTEgMTAwNjQ0Ci0tLSBhL2FyY2gvbmlvczIvaW5jbHVkZS91YXBp L2FzbS9LYnVpbGQKKysrIGIvYXJjaC9uaW9zMi9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZApAQCAt MSw1ICsxLDMgQEAKKyMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKIGluY2x1ZGUgaW5jbHVkZS91 YXBpL2FzbS1nZW5lcmljL0tidWlsZC5hc20KLQotaGVhZGVyLXkgKz0gZWxmLmgKLQogZ2VuZXJp Yy15ICs9IHVjb250ZXh0LmgKZGlmZiAtLWdpdCBhL2FyY2gvb3BlbnJpc2MvaW5jbHVkZS9hc20v S2J1aWxkIGIvYXJjaC9vcGVucmlzYy9pbmNsdWRlL2FzbS9LYnVpbGQKaW5kZXggMjgzMmYwMzFm YjExLi41NjE5MTU3MTZmZDkgMTAwNjQ0Ci0tLSBhL2FyY2gvb3BlbnJpc2MvaW5jbHVkZS9hc20v S2J1aWxkCisrKyBiL2FyY2gvb3BlbnJpc2MvaW5jbHVkZS9hc20vS2J1aWxkCkBAIC0xLDYgKzEs MyBAQAotCi1oZWFkZXIteSArPSB1Y29udGV4dC5oCi0KIGdlbmVyaWMteSArPSBhdG9taWMuaAog Z2VuZXJpYy15ICs9IGF1eHZlYy5oCiBnZW5lcmljLXkgKz0gYmFycmllci5oCmRpZmYgLS1naXQg YS9hcmNoL29wZW5yaXNjL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkIGIvYXJjaC9vcGVucmlzYy9p bmNsdWRlL3VhcGkvYXNtL0tidWlsZAppbmRleCA4MDc2MWViODJiNWYuLmIxNWJmNmJjMGU5NCAx MDA2NDQKLS0tIGEvYXJjaC9vcGVucmlzYy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAorKysgYi9h cmNoL29wZW5yaXNjL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCkBAIC0xLDEwICsxLDIgQEAKICMg VUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKIGluY2x1ZGUgaW5jbHVkZS91YXBpL2FzbS1nZW5lcmlj L0tidWlsZC5hc20KLQotaGVhZGVyLXkgKz0gYnl0ZW9yZGVyLmgKLWhlYWRlci15ICs9IGVsZi5o Ci1oZWFkZXIteSArPSBrdm1fcGFyYS5oCi1oZWFkZXIteSArPSBwYXJhbS5oCi1oZWFkZXIteSAr PSBwdHJhY2UuaAotaGVhZGVyLXkgKz0gc2lnY29udGV4dC5oCi1oZWFkZXIteSArPSB1bmlzdGQu aApkaWZmIC0tZ2l0IGEvYXJjaC9wYXJpc2MvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgYi9hcmNo L3BhcmlzYy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAppbmRleCAzNDgzNTZjOTk1MTQuLjM5NzFj NjBhN2U3ZiAxMDA2NDQKLS0tIGEvYXJjaC9wYXJpc2MvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQK KysrIGIvYXJjaC9wYXJpc2MvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKQEAgLTIsMzEgKzIsMyBA QAogaW5jbHVkZSBpbmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMvS2J1aWxkLmFzbQogCiBnZW5lcmlj LXkgKz0gcmVzb3VyY2UuaAotCi1oZWFkZXIteSArPSBiaXRzcGVybG9uZy5oCi1oZWFkZXIteSAr PSBieXRlb3JkZXIuaAotaGVhZGVyLXkgKz0gZXJybm8uaAotaGVhZGVyLXkgKz0gZmNudGwuaAot aGVhZGVyLXkgKz0gaW9jdGwuaAotaGVhZGVyLXkgKz0gaW9jdGxzLmgKLWhlYWRlci15ICs9IGlw Y2J1Zi5oCi1oZWFkZXIteSArPSBtbWFuLmgKLWhlYWRlci15ICs9IG1zZ2J1Zi5oCi1oZWFkZXIt eSArPSBwZGMuaAotaGVhZGVyLXkgKz0gcG9zaXhfdHlwZXMuaAotaGVhZGVyLXkgKz0gcHRyYWNl LmgKLWhlYWRlci15ICs9IHNlbWJ1Zi5oCi1oZWFkZXIteSArPSBzZXR1cC5oCi1oZWFkZXIteSAr PSBzaG1idWYuaAotaGVhZGVyLXkgKz0gc2lnY29udGV4dC5oCi1oZWFkZXIteSArPSBzaWdpbmZv LmgKLWhlYWRlci15ICs9IHNpZ25hbC5oCi1oZWFkZXIteSArPSBzb2NrZXQuaAotaGVhZGVyLXkg Kz0gc29ja2lvcy5oCi1oZWFkZXIteSArPSBzdGF0LmgKLWhlYWRlci15ICs9IHN0YXRmcy5oCi1o ZWFkZXIteSArPSBzd2FiLmgKLWhlYWRlci15ICs9IHRlcm1iaXRzLmgKLWhlYWRlci15ICs9IHRl cm1pb3MuaAotaGVhZGVyLXkgKz0gdHlwZXMuaAotaGVhZGVyLXkgKz0gdW5pc3RkLmgKZGlmZiAt LWdpdCBhL2FyY2gvcG93ZXJwYy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCBiL2FyY2gvcG93ZXJw Yy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAppbmRleCBkYWIzNzE3ZTNlYTAuLmIxNWJmNmJjMGU5 NCAxMDA2NDQKLS0tIGEvYXJjaC9wb3dlcnBjL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCisrKyBi L2FyY2gvcG93ZXJwYy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZApAQCAtMSw0NyArMSwyIEBACiAj IFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0CiBpbmNsdWRlIGluY2x1ZGUvdWFwaS9hc20tZ2VuZXJp Yy9LYnVpbGQuYXNtCi0KLWhlYWRlci15ICs9IGF1eHZlYy5oCi1oZWFkZXIteSArPSBiaXRzcGVy bG9uZy5oCi1oZWFkZXIteSArPSBib290eC5oCi1oZWFkZXIteSArPSBieXRlb3JkZXIuaAotaGVh ZGVyLXkgKz0gY3B1dGFibGUuaAotaGVhZGVyLXkgKz0gZWVoLmgKLWhlYWRlci15ICs9IGVsZi5o Ci1oZWFkZXIteSArPSBlcGFwcl9oY2FsbHMuaAotaGVhZGVyLXkgKz0gZXJybm8uaAotaGVhZGVy LXkgKz0gZmNudGwuaAotaGVhZGVyLXkgKz0gaW9jdGwuaAotaGVhZGVyLXkgKz0gaW9jdGxzLmgK LWhlYWRlci15ICs9IGlwY2J1Zi5oCi1oZWFkZXIteSArPSBrdm0uaAotaGVhZGVyLXkgKz0ga3Zt X3BhcmEuaAotaGVhZGVyLXkgKz0gbW1hbi5oCi1oZWFkZXIteSArPSBtc2didWYuaAotaGVhZGVy LXkgKz0gbnZyYW0uaAotaGVhZGVyLXkgKz0gb3BhbC1wcmQuaAotaGVhZGVyLXkgKz0gcGFyYW0u aAotaGVhZGVyLXkgKz0gcGVyZl9ldmVudC5oCi1oZWFkZXIteSArPSBwb2xsLmgKLWhlYWRlci15 ICs9IHBvc2l4X3R5cGVzLmgKLWhlYWRlci15ICs9IHBzM2ZiLmgKLWhlYWRlci15ICs9IHB0cmFj ZS5oCi1oZWFkZXIteSArPSByZXNvdXJjZS5oCi1oZWFkZXIteSArPSBzZW1idWYuaAotaGVhZGVy LXkgKz0gc2V0dXAuaAotaGVhZGVyLXkgKz0gc2htYnVmLmgKLWhlYWRlci15ICs9IHNpZ2NvbnRl eHQuaAotaGVhZGVyLXkgKz0gc2lnaW5mby5oCi1oZWFkZXIteSArPSBzaWduYWwuaAotaGVhZGVy LXkgKz0gc29ja2V0LmgKLWhlYWRlci15ICs9IHNvY2tpb3MuaAotaGVhZGVyLXkgKz0gc3B1X2lu Zm8uaAotaGVhZGVyLXkgKz0gc3RhdC5oCi1oZWFkZXIteSArPSBzdGF0ZnMuaAotaGVhZGVyLXkg Kz0gc3dhYi5oCi1oZWFkZXIteSArPSB0ZXJtYml0cy5oCi1oZWFkZXIteSArPSB0ZXJtaW9zLmgK LWhlYWRlci15ICs9IHRtLmgKLWhlYWRlci15ICs9IHR5cGVzLmgKLWhlYWRlci15ICs9IHVjb250 ZXh0LmgKLWhlYWRlci15ICs9IHVuaXN0ZC5oCmRpZmYgLS1naXQgYS9hcmNoL3MzOTAvaW5jbHVk ZS91YXBpL2FzbS9LYnVpbGQgYi9hcmNoL3MzOTAvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKaW5k ZXggYmY3MzZlNzY0Y2I0Li5iMTViZjZiYzBlOTQgMTAwNjQ0Ci0tLSBhL2FyY2gvczM5MC9pbmNs dWRlL3VhcGkvYXNtL0tidWlsZAorKysgYi9hcmNoL3MzOTAvaW5jbHVkZS91YXBpL2FzbS9LYnVp bGQKQEAgLTEsNTQgKzEsMiBAQAogIyBVQVBJIEhlYWRlciBleHBvcnQgbGlzdAogaW5jbHVkZSBp bmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMvS2J1aWxkLmFzbQotCi1oZWFkZXIteSArPSBhdXh2ZWMu aAotaGVhZGVyLXkgKz0gYml0c3BlcmxvbmcuaAotaGVhZGVyLXkgKz0gYnl0ZW9yZGVyLmgKLWhl YWRlci15ICs9IGNocGlkLmgKLWhlYWRlci15ICs9IGNoc2MuaAotaGVhZGVyLXkgKz0gY2xwLmgK LWhlYWRlci15ICs9IGNtYi5oCi1oZWFkZXIteSArPSBkYXNkLmgKLWhlYWRlci15ICs9IGRlYnVn LmgKLWhlYWRlci15ICs9IGVycm5vLmgKLWhlYWRlci15ICs9IGZjbnRsLmgKLWhlYWRlci15ICs9 IGh5cGZzLmgKLWhlYWRlci15ICs9IGlvY3RsLmgKLWhlYWRlci15ICs9IGlvY3Rscy5oCi1oZWFk ZXIteSArPSBpcGNidWYuaAotaGVhZGVyLXkgKz0ga3ZtLmgKLWhlYWRlci15ICs9IGt2bV9wYXJh LmgKLWhlYWRlci15ICs9IGt2bV9wZXJmLmgKLWhlYWRlci15ICs9IGt2bV92aXJ0aW8uaAotaGVh ZGVyLXkgKz0gbW1hbi5oCi1oZWFkZXIteSArPSBtb253cml0ZXIuaAotaGVhZGVyLXkgKz0gbXNn YnVmLmgKLWhlYWRlci15ICs9IHBhcmFtLmgKLWhlYWRlci15ICs9IHBvbGwuaAotaGVhZGVyLXkg Kz0gcG9zaXhfdHlwZXMuaAotaGVhZGVyLXkgKz0gcHRyYWNlLmgKLWhlYWRlci15ICs9IHFldGgu aAotaGVhZGVyLXkgKz0gcmVzb3VyY2UuaAotaGVhZGVyLXkgKz0gc2NoaWQuaAotaGVhZGVyLXkg Kz0gc2NscF9jdGwuaAotaGVhZGVyLXkgKz0gc2VtYnVmLmgKLWhlYWRlci15ICs9IHNldHVwLmgK LWhlYWRlci15ICs9IHNobWJ1Zi5oCi1oZWFkZXIteSArPSBzaWUuaAotaGVhZGVyLXkgKz0gc2ln Y29udGV4dC5oCi1oZWFkZXIteSArPSBzaWdpbmZvLmgKLWhlYWRlci15ICs9IHNpZ25hbC5oCi1o ZWFkZXIteSArPSBzb2NrZXQuaAotaGVhZGVyLXkgKz0gc29ja2lvcy5oCi1oZWFkZXIteSArPSBz dGF0LmgKLWhlYWRlci15ICs9IHN0YXRmcy5oCi1oZWFkZXIteSArPSBzd2FiLmgKLWhlYWRlci15 ICs9IHRhcGUzOTAuaAotaGVhZGVyLXkgKz0gdGVybWJpdHMuaAotaGVhZGVyLXkgKz0gdGVybWlv cy5oCi1oZWFkZXIteSArPSB0eXBlcy5oCi1oZWFkZXIteSArPSB1Y29udGV4dC5oCi1oZWFkZXIt eSArPSB1bmlzdGQuaAotaGVhZGVyLXkgKz0gdmlydGlvLWNjdy5oCi1oZWFkZXIteSArPSB2dG9j LmgKLWhlYWRlci15ICs9IHpjcnlwdC5oCmRpZmYgLS1naXQgYS9hcmNoL3Njb3JlL2luY2x1ZGUv YXNtL0tidWlsZCBiL2FyY2gvc2NvcmUvaW5jbHVkZS9hc20vS2J1aWxkCmluZGV4IGEwNTIxOGZm M2ZlNC4uMTI4Y2E3ZWMwMjIwIDEwMDY0NAotLS0gYS9hcmNoL3Njb3JlL2luY2x1ZGUvYXNtL0ti dWlsZAorKysgYi9hcmNoL3Njb3JlL2luY2x1ZGUvYXNtL0tidWlsZApAQCAtMSw3ICsxLDMgQEAK LQotaGVhZGVyLXkgKz0KLQotCiBnZW5lcmljLXkgKz0gYmFycmllci5oCiBnZW5lcmljLXkgKz0g Y2xrZGV2LmgKIGdlbmVyaWMteSArPSBjcHV0aW1lLmgKZGlmZiAtLWdpdCBhL2FyY2gvc2NvcmUv aW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgYi9hcmNoL3Njb3JlL2luY2x1ZGUvdWFwaS9hc20vS2J1 aWxkCmluZGV4IDA0MDE3OGNkYjNlYi4uYjE1YmY2YmMwZTk0IDEwMDY0NAotLS0gYS9hcmNoL3Nj b3JlL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCisrKyBiL2FyY2gvc2NvcmUvaW5jbHVkZS91YXBp L2FzbS9LYnVpbGQKQEAgLTEsMzQgKzEsMiBAQAogIyBVQVBJIEhlYWRlciBleHBvcnQgbGlzdAog aW5jbHVkZSBpbmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMvS2J1aWxkLmFzbQotCi1oZWFkZXIteSAr PSBhdXh2ZWMuaAotaGVhZGVyLXkgKz0gYml0c3BlcmxvbmcuaAotaGVhZGVyLXkgKz0gYnl0ZW9y ZGVyLmgKLWhlYWRlci15ICs9IGVycm5vLmgKLWhlYWRlci15ICs9IGZjbnRsLmgKLWhlYWRlci15 ICs9IGlvY3RsLmgKLWhlYWRlci15ICs9IGlvY3Rscy5oCi1oZWFkZXIteSArPSBpcGNidWYuaAot aGVhZGVyLXkgKz0ga3ZtX3BhcmEuaAotaGVhZGVyLXkgKz0gbW1hbi5oCi1oZWFkZXIteSArPSBt c2didWYuaAotaGVhZGVyLXkgKz0gcGFyYW0uaAotaGVhZGVyLXkgKz0gcG9sbC5oCi1oZWFkZXIt eSArPSBwb3NpeF90eXBlcy5oCi1oZWFkZXIteSArPSBwdHJhY2UuaAotaGVhZGVyLXkgKz0gcmVz b3VyY2UuaAotaGVhZGVyLXkgKz0gc2VtYnVmLmgKLWhlYWRlci15ICs9IHNldHVwLmgKLWhlYWRl ci15ICs9IHNobWJ1Zi5oCi1oZWFkZXIteSArPSBzaWdjb250ZXh0LmgKLWhlYWRlci15ICs9IHNp Z2luZm8uaAotaGVhZGVyLXkgKz0gc2lnbmFsLmgKLWhlYWRlci15ICs9IHNvY2tldC5oCi1oZWFk ZXIteSArPSBzb2NraW9zLmgKLWhlYWRlci15ICs9IHN0YXQuaAotaGVhZGVyLXkgKz0gc3RhdGZz LmgKLWhlYWRlci15ICs9IHN3YWIuaAotaGVhZGVyLXkgKz0gdGVybWJpdHMuaAotaGVhZGVyLXkg Kz0gdGVybWlvcy5oCi1oZWFkZXIteSArPSB0eXBlcy5oCi1oZWFkZXIteSArPSB1bmlzdGQuaApk aWZmIC0tZ2l0IGEvYXJjaC9zaC9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCBiL2FyY2gvc2gvaW5j bHVkZS91YXBpL2FzbS9LYnVpbGQKaW5kZXggNjA2MTNhZTc4NTEzLi5iMTViZjZiYzBlOTQgMTAw NjQ0Ci0tLSBhL2FyY2gvc2gvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKKysrIGIvYXJjaC9zaC9p bmNsdWRlL3VhcGkvYXNtL0tidWlsZApAQCAtMSwyNSArMSwyIEBACiAjIFVBUEkgSGVhZGVyIGV4 cG9ydCBsaXN0CiBpbmNsdWRlIGluY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVpbGQuYXNtCi0K LWhlYWRlci15ICs9IGF1eHZlYy5oCi1oZWFkZXIteSArPSBieXRlb3JkZXIuaAotaGVhZGVyLXkg Kz0gY2FjaGVjdGwuaAotaGVhZGVyLXkgKz0gY3B1LWZlYXR1cmVzLmgKLWhlYWRlci15ICs9IGh3 X2JyZWFrcG9pbnQuaAotaGVhZGVyLXkgKz0gaW9jdGxzLmgKLWhlYWRlci15ICs9IHBvc2l4X3R5 cGVzLmgKLWhlYWRlci15ICs9IHBvc2l4X3R5cGVzXzMyLmgKLWhlYWRlci15ICs9IHBvc2l4X3R5 cGVzXzY0LmgKLWhlYWRlci15ICs9IHB0cmFjZS5oCi1oZWFkZXIteSArPSBwdHJhY2VfMzIuaAot aGVhZGVyLXkgKz0gcHRyYWNlXzY0LmgKLWhlYWRlci15ICs9IHNldHVwLmgKLWhlYWRlci15ICs9 IHNpZ2NvbnRleHQuaAotaGVhZGVyLXkgKz0gc2lnbmFsLmgKLWhlYWRlci15ICs9IHNvY2tpb3Mu aAotaGVhZGVyLXkgKz0gc3RhdC5oCi1oZWFkZXIteSArPSBzd2FiLmgKLWhlYWRlci15ICs9IHR5 cGVzLmgKLWhlYWRlci15ICs9IHVuaXN0ZC5oCi1oZWFkZXIteSArPSB1bmlzdGRfMzIuaAotaGVh ZGVyLXkgKz0gdW5pc3RkXzY0LmgKZGlmZiAtLWdpdCBhL2FyY2gvc3BhcmMvaW5jbHVkZS91YXBp L2FzbS9LYnVpbGQgYi9hcmNoL3NwYXJjL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCmluZGV4IGI1 ODQzZWUwOWZiNS4uYjE1YmY2YmMwZTk0IDEwMDY0NAotLS0gYS9hcmNoL3NwYXJjL2luY2x1ZGUv dWFwaS9hc20vS2J1aWxkCisrKyBiL2FyY2gvc3BhcmMvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQK QEAgLTEsNTAgKzEsMiBAQAogIyBVQVBJIEhlYWRlciBleHBvcnQgbGlzdAotIyBVc2VyIGV4cG9y dGVkIHNwYXJjIGhlYWRlciBmaWxlcwotCiBpbmNsdWRlIGluY2x1ZGUvdWFwaS9hc20tZ2VuZXJp Yy9LYnVpbGQuYXNtCi0KLWhlYWRlci15ICs9IGFwYy5oCi1oZWFkZXIteSArPSBhc2kuaAotaGVh ZGVyLXkgKz0gYXV4dmVjLmgKLWhlYWRlci15ICs9IGJpdHNwZXJsb25nLmgKLWhlYWRlci15ICs9 IGJ5dGVvcmRlci5oCi1oZWFkZXIteSArPSBkaXNwbGF5N3NlZy5oCi1oZWFkZXIteSArPSBlbnZj dHJsLmgKLWhlYWRlci15ICs9IGVycm5vLmgKLWhlYWRlci15ICs9IGZiaW8uaAotaGVhZGVyLXkg Kz0gZmNudGwuaAotaGVhZGVyLXkgKz0gaW9jdGwuaAotaGVhZGVyLXkgKz0gaW9jdGxzLmgKLWhl YWRlci15ICs9IGlwY2J1Zi5oCi1oZWFkZXIteSArPSBqc2ZsYXNoLmgKLWhlYWRlci15ICs9IGt2 bV9wYXJhLmgKLWhlYWRlci15ICs9IG1tYW4uaAotaGVhZGVyLXkgKz0gbXNnYnVmLmgKLWhlYWRl ci15ICs9IG9wZW5wcm9taW8uaAotaGVhZGVyLXkgKz0gcGFyYW0uaAotaGVhZGVyLXkgKz0gcGVy ZmN0ci5oCi1oZWFkZXIteSArPSBwb2xsLmgKLWhlYWRlci15ICs9IHBvc2l4X3R5cGVzLmgKLWhl YWRlci15ICs9IHBzci5oCi1oZWFkZXIteSArPSBwc3Jjb21wYXQuaAotaGVhZGVyLXkgKz0gcHN0 YXRlLmgKLWhlYWRlci15ICs9IHB0cmFjZS5oCi1oZWFkZXIteSArPSByZXNvdXJjZS5oCi1oZWFk ZXIteSArPSBzZW1idWYuaAotaGVhZGVyLXkgKz0gc2V0dXAuaAotaGVhZGVyLXkgKz0gc2htYnVm LmgKLWhlYWRlci15ICs9IHNpZ2NvbnRleHQuaAotaGVhZGVyLXkgKz0gc2lnaW5mby5oCi1oZWFk ZXIteSArPSBzaWduYWwuaAotaGVhZGVyLXkgKz0gc29ja2V0LmgKLWhlYWRlci15ICs9IHNvY2tp b3MuaAotaGVhZGVyLXkgKz0gc3RhdC5oCi1oZWFkZXIteSArPSBzdGF0ZnMuaAotaGVhZGVyLXkg Kz0gc3dhYi5oCi1oZWFkZXIteSArPSB0ZXJtYml0cy5oCi1oZWFkZXIteSArPSB0ZXJtaW9zLmgK LWhlYWRlci15ICs9IHRyYXBzLmgKLWhlYWRlci15ICs9IHVjdHguaAotaGVhZGVyLXkgKz0gdW5p c3RkLmgKLWhlYWRlci15ICs9IHV0cmFwLmgKLWhlYWRlci15ICs9IHdhdGNoZG9nLmgKZGlmZiAt LWdpdCBhL2FyY2gvdGlsZS9pbmNsdWRlL2FzbS9LYnVpbGQgYi9hcmNoL3RpbGUvaW5jbHVkZS9h c20vS2J1aWxkCmluZGV4IDJkMWY1NjM4OTc0Yy4uMDU3ZWFhNTMzODc3IDEwMDY0NAotLS0gYS9h cmNoL3RpbGUvaW5jbHVkZS9hc20vS2J1aWxkCisrKyBiL2FyY2gvdGlsZS9pbmNsdWRlL2FzbS9L YnVpbGQKQEAgLTEsNiArMSwzIEBACi0KLWhlYWRlci15ICs9IC4uL2FyY2gvCi0KIGdlbmVyaWMt eSArPSBidWcuaAogZ2VuZXJpYy15ICs9IGJ1Z3MuaAogZ2VuZXJpYy15ICs9IGNsa2Rldi5oCmRp ZmYgLS1naXQgYS9hcmNoL3RpbGUvaW5jbHVkZS91YXBpL2FyY2gvS2J1aWxkIGIvYXJjaC90aWxl L2luY2x1ZGUvdWFwaS9hcmNoL0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg OTdkZmJlY2VjNmI2Li4wMDAwMDAwMDAwMDAKLS0tIGEvYXJjaC90aWxlL2luY2x1ZGUvdWFwaS9h cmNoL0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDE3ICswLDAgQEAKLSMgVUFQSSBIZWFkZXIg ZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IGFiaS5oCi1oZWFkZXIteSArPSBjaGlwLmgKLWhlYWRl ci15ICs9IGNoaXBfdGlsZWd4LmgKLWhlYWRlci15ICs9IGNoaXBfdGlsZXByby5oCi1oZWFkZXIt eSArPSBpY2FjaGUuaAotaGVhZGVyLXkgKz0gaW50ZXJydXB0cy5oCi1oZWFkZXIteSArPSBpbnRl cnJ1cHRzXzMyLmgKLWhlYWRlci15ICs9IGludGVycnVwdHNfNjQuaAotaGVhZGVyLXkgKz0gb3Bj b2RlLmgKLWhlYWRlci15ICs9IG9wY29kZV90aWxlZ3guaAotaGVhZGVyLXkgKz0gb3Bjb2RlX3Rp bGVwcm8uaAotaGVhZGVyLXkgKz0gc2ltLmgKLWhlYWRlci15ICs9IHNpbV9kZWYuaAotaGVhZGVy LXkgKz0gc3ByX2RlZi5oCi1oZWFkZXIteSArPSBzcHJfZGVmXzMyLmgKLWhlYWRlci15ICs9IHNw cl9kZWZfNjQuaApkaWZmIC0tZ2l0IGEvYXJjaC90aWxlL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxk IGIvYXJjaC90aWxlL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCmluZGV4IGMyMGRiOGU0MjhiZi4u ZTBhNTAxMTFlMDdmIDEwMDY0NAotLS0gYS9hcmNoL3RpbGUvaW5jbHVkZS91YXBpL2FzbS9LYnVp bGQKKysrIGIvYXJjaC90aWxlL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCkBAIC0xLDIxICsxLDYg QEAKICMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKIGluY2x1ZGUgaW5jbHVkZS91YXBpL2FzbS1n ZW5lcmljL0tidWlsZC5hc20KIAotaGVhZGVyLXkgKz0gYXV4dmVjLmgKLWhlYWRlci15ICs9IGJp dHNwZXJsb25nLmgKLWhlYWRlci15ICs9IGJ5dGVvcmRlci5oCi1oZWFkZXIteSArPSBjYWNoZWN0 bC5oCi1oZWFkZXIteSArPSBoYXJkd2FsbC5oCi1oZWFkZXIteSArPSBrdm1fcGFyYS5oCi1oZWFk ZXIteSArPSBtbWFuLmgKLWhlYWRlci15ICs9IHB0cmFjZS5oCi1oZWFkZXIteSArPSBzZXR1cC5o Ci1oZWFkZXIteSArPSBzaWdjb250ZXh0LmgKLWhlYWRlci15ICs9IHNpZ2luZm8uaAotaGVhZGVy LXkgKz0gc2lnbmFsLmgKLWhlYWRlci15ICs9IHN0YXQuaAotaGVhZGVyLXkgKz0gc3dhYi5oCi1o ZWFkZXIteSArPSB1Y29udGV4dC5oCi1oZWFkZXIteSArPSB1bmlzdGQuaAotCiBnZW5lcmljLXkg Kz0gdWNvbnRleHQuaAorCitzdWJkaXIteSArPSAuLi9hcmNoCmRpZmYgLS1naXQgYS9hcmNoL3Vu aWNvcmUzMi9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCBiL2FyY2gvdW5pY29yZTMyL2luY2x1ZGUv dWFwaS9hc20vS2J1aWxkCmluZGV4IDA1MTRkN2FkNjg1NS4uMTNhOTdhYTIyODVmIDEwMDY0NAot LS0gYS9hcmNoL3VuaWNvcmUzMi9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAorKysgYi9hcmNoL3Vu aWNvcmUzMi9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZApAQCAtMSwxMCArMSw0IEBACiAjIFVBUEkg SGVhZGVyIGV4cG9ydCBsaXN0CiBpbmNsdWRlIGluY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVp bGQuYXNtCiAKLWhlYWRlci15ICs9IGJ5dGVvcmRlci5oCi1oZWFkZXIteSArPSBrdm1fcGFyYS5o Ci1oZWFkZXIteSArPSBwdHJhY2UuaAotaGVhZGVyLXkgKz0gc2lnY29udGV4dC5oCi1oZWFkZXIt eSArPSB1bmlzdGQuaAotCiBnZW5lcmljLXkgKz0ga3ZtX3BhcmEuaApkaWZmIC0tZ2l0IGEvYXJj aC94ODYvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgYi9hcmNoL3g4Ni9pbmNsdWRlL3VhcGkvYXNt L0tidWlsZAppbmRleCAzZGVjNzY5Y2FkZjcuLjgzYjZlOWEwZGNlNCAxMDA2NDQKLS0tIGEvYXJj aC94ODYvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKKysrIGIvYXJjaC94ODYvaW5jbHVkZS91YXBp L2FzbS9LYnVpbGQKQEAgLTQsNjIgKzQsMyBAQCBpbmNsdWRlIGluY2x1ZGUvdWFwaS9hc20tZ2Vu ZXJpYy9LYnVpbGQuYXNtCiBnZW5oZHIteSArPSB1bmlzdGRfMzIuaAogZ2VuaGRyLXkgKz0gdW5p c3RkXzY0LmgKIGdlbmhkci15ICs9IHVuaXN0ZF94MzIuaAotaGVhZGVyLXkgKz0gYS5vdXQuaAot aGVhZGVyLXkgKz0gYXV4dmVjLmgKLWhlYWRlci15ICs9IGJpdHNwZXJsb25nLmgKLWhlYWRlci15 ICs9IGJvb3QuaAotaGVhZGVyLXkgKz0gYm9vdHBhcmFtLmgKLWhlYWRlci15ICs9IGJ5dGVvcmRl ci5oCi1oZWFkZXIteSArPSBkZWJ1Z3JlZy5oCi1oZWFkZXIteSArPSBlODIwLmgKLWhlYWRlci15 ICs9IGVycm5vLmgKLWhlYWRlci15ICs9IGZjbnRsLmgKLWhlYWRlci15ICs9IGh3X2JyZWFrcG9p bnQuaAotaGVhZGVyLXkgKz0gaHlwZXJ2LmgKLWhlYWRlci15ICs9IGlvY3RsLmgKLWhlYWRlci15 ICs9IGlvY3Rscy5oCi1oZWFkZXIteSArPSBpcGNidWYuaAotaGVhZGVyLXkgKz0gaXN0LmgKLWhl YWRlci15ICs9IGt2bS5oCi1oZWFkZXIteSArPSBrdm1fcGFyYS5oCi1oZWFkZXIteSArPSBrdm1f cGVyZi5oCi1oZWFkZXIteSArPSBsZHQuaAotaGVhZGVyLXkgKz0gbWNlLmgKLWhlYWRlci15ICs9 IG1tYW4uaAotaGVhZGVyLXkgKz0gbXNnYnVmLmgKLWhlYWRlci15ICs9IG1zci1pbmRleC5oCi1o ZWFkZXIteSArPSBtc3IuaAotaGVhZGVyLXkgKz0gbXRyci5oCi1oZWFkZXIteSArPSBwYXJhbS5o Ci1oZWFkZXIteSArPSBwZXJmX3JlZ3MuaAotaGVhZGVyLXkgKz0gcG9sbC5oCi1oZWFkZXIteSAr PSBwb3NpeF90eXBlcy5oCi1oZWFkZXIteSArPSBwb3NpeF90eXBlc18zMi5oCi1oZWFkZXIteSAr PSBwb3NpeF90eXBlc182NC5oCi1oZWFkZXIteSArPSBwb3NpeF90eXBlc194MzIuaAotaGVhZGVy LXkgKz0gcHJjdGwuaAotaGVhZGVyLXkgKz0gcHJvY2Vzc29yLWZsYWdzLmgKLWhlYWRlci15ICs9 IHB0cmFjZS1hYmkuaAotaGVhZGVyLXkgKz0gcHRyYWNlLmgKLWhlYWRlci15ICs9IHJlc291cmNl LmgKLWhlYWRlci15ICs9IHNlbWJ1Zi5oCi1oZWFkZXIteSArPSBzZXR1cC5oCi1oZWFkZXIteSAr PSBzaG1idWYuaAotaGVhZGVyLXkgKz0gc2lnY29udGV4dC5oCi1oZWFkZXIteSArPSBzaWdjb250 ZXh0MzIuaAotaGVhZGVyLXkgKz0gc2lnaW5mby5oCi1oZWFkZXIteSArPSBzaWduYWwuaAotaGVh ZGVyLXkgKz0gc29ja2V0LmgKLWhlYWRlci15ICs9IHNvY2tpb3MuaAotaGVhZGVyLXkgKz0gc3Rh dC5oCi1oZWFkZXIteSArPSBzdGF0ZnMuaAotaGVhZGVyLXkgKz0gc3ZtLmgKLWhlYWRlci15ICs9 IHN3YWIuaAotaGVhZGVyLXkgKz0gdGVybWJpdHMuaAotaGVhZGVyLXkgKz0gdGVybWlvcy5oCi1o ZWFkZXIteSArPSB0eXBlcy5oCi1oZWFkZXIteSArPSB1Y29udGV4dC5oCi1oZWFkZXIteSArPSB1 bmlzdGQuaAotaGVhZGVyLXkgKz0gdm04Ni5oCi1oZWFkZXIteSArPSB2bXguaAotaGVhZGVyLXkg Kz0gdnN5c2NhbGwuaApkaWZmIC0tZ2l0IGEvYXJjaC94dGVuc2EvaW5jbHVkZS91YXBpL2FzbS9L YnVpbGQgYi9hcmNoL3h0ZW5zYS9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAppbmRleCA1NmFhZDU0 ZTdmYjcuLmIxNWJmNmJjMGU5NCAxMDA2NDQKLS0tIGEvYXJjaC94dGVuc2EvaW5jbHVkZS91YXBp L2FzbS9LYnVpbGQKKysrIGIvYXJjaC94dGVuc2EvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKQEAg LTEsMjUgKzEsMiBAQAogIyBVQVBJIEhlYWRlciBleHBvcnQgbGlzdAogaW5jbHVkZSBpbmNsdWRl L3VhcGkvYXNtLWdlbmVyaWMvS2J1aWxkLmFzbQotCi1oZWFkZXIteSArPSBhdXh2ZWMuaAotaGVh ZGVyLXkgKz0gYnl0ZW9yZGVyLmgKLWhlYWRlci15ICs9IGlvY3Rscy5oCi1oZWFkZXIteSArPSBp cGNidWYuaAotaGVhZGVyLXkgKz0gbW1hbi5oCi1oZWFkZXIteSArPSBtc2didWYuaAotaGVhZGVy LXkgKz0gcGFyYW0uaAotaGVhZGVyLXkgKz0gcG9sbC5oCi1oZWFkZXIteSArPSBwb3NpeF90eXBl cy5oCi1oZWFkZXIteSArPSBwdHJhY2UuaAotaGVhZGVyLXkgKz0gc2VtYnVmLmgKLWhlYWRlci15 ICs9IHNldHVwLmgKLWhlYWRlci15ICs9IHNobWJ1Zi5oCi1oZWFkZXIteSArPSBzaWdjb250ZXh0 LmgKLWhlYWRlci15ICs9IHNpZ25hbC5oCi1oZWFkZXIteSArPSBzb2NrZXQuaAotaGVhZGVyLXkg Kz0gc29ja2lvcy5oCi1oZWFkZXIteSArPSBzdGF0LmgKLWhlYWRlci15ICs9IHN3YWIuaAotaGVh ZGVyLXkgKz0gdGVybWJpdHMuaAotaGVhZGVyLXkgKz0gdHlwZXMuaAotaGVhZGVyLXkgKz0gdW5p c3RkLmgKZGlmZiAtLWdpdCBhL2luY2x1ZGUvS2J1aWxkIGIvaW5jbHVkZS9LYnVpbGQKZGVsZXRl ZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGJhYjExNDViYzdhNy4uMDAwMDAwMDAwMDAwCi0tLSBh L2luY2x1ZGUvS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsMiArMCwwIEBACi0jIFRvcC1sZXZl bCBNYWtlZmlsZSBjYWxscyBpbnRvIGFzbS0kKEFSQ0gpCi0jIExpc3Qgb25seSBub24tYXJjaCBk aXJlY3RvcmllcyBiZWxvdwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9hc20tZ2VuZXJpYy9LYnVpbGQu YXNtIGIvaW5jbHVkZS9hc20tZ2VuZXJpYy9LYnVpbGQuYXNtCmRlbGV0ZWQgZmlsZSBtb2RlIDEw MDY0NAppbmRleCBkMmVlODZiNGMwOTEuLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL2FzbS1n ZW5lcmljL0tidWlsZC5hc20KKysrIC9kZXYvbnVsbApAQCAtMSArMCwwIEBACi1pbmNsdWRlIGlu Y2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVpbGQuYXNtCmRpZmYgLS1naXQgYS9pbmNsdWRlL3Nj c2kvZmMvS2J1aWxkIGIvaW5jbHVkZS9zY3NpL2ZjL0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggZTY5ZGUyOWJiMmQxLi4wMDAwMDAwMDAwMDAKZGlmZiAtLWdpdCBhL2luY2x1 ZGUvdWFwaS9LYnVpbGQgYi9pbmNsdWRlL3VhcGkvS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAyNDVhYTZlMDVlNmEuLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL3VhcGkv S2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsMTUgKzAsMCBAQAotIyBVQVBJIEhlYWRlciBleHBv cnQgbGlzdAotIyBUb3AtbGV2ZWwgTWFrZWZpbGUgY2FsbHMgaW50byBhc20tJChBUkNIKQotIyBM aXN0IG9ubHkgbm9uLWFyY2ggZGlyZWN0b3JpZXMgYmVsb3cKLQotCi1oZWFkZXIteSArPSBhc20t Z2VuZXJpYy8KLWhlYWRlci15ICs9IGxpbnV4LwotaGVhZGVyLXkgKz0gc291bmQvCi1oZWFkZXIt eSArPSBtdGQvCi1oZWFkZXIteSArPSByZG1hLwotaGVhZGVyLXkgKz0gdmlkZW8vCi1oZWFkZXIt eSArPSBkcm0vCi1oZWFkZXIteSArPSB4ZW4vCi1oZWFkZXIteSArPSBzY3NpLwotaGVhZGVyLXkg Kz0gbWlzYy8KZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVpbGQgYi9p bmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMvS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NApp bmRleCBiNzNkZTdiYjdhNjIuLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL3VhcGkvYXNtLWdl bmVyaWMvS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsMzYgKzAsMCBAQAotIyBVQVBJIEhlYWRl ciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gYXV4dmVjLmgKLWhlYWRlci15ICs9IGJpdHNwZXJs b25nLmgKLWhlYWRlci15ICs9IGVycm5vLWJhc2UuaAotaGVhZGVyLXkgKz0gZXJybm8uaAotaGVh ZGVyLXkgKz0gZmNudGwuaAotaGVhZGVyLXkgKz0gaW50LWw2NC5oCi1oZWFkZXIteSArPSBpbnQt bGw2NC5oCi1oZWFkZXIteSArPSBpb2N0bC5oCi1oZWFkZXIteSArPSBpb2N0bHMuaAotaGVhZGVy LXkgKz0gaXBjYnVmLmgKLWhlYWRlci15ICs9IGt2bV9wYXJhLmgKLWhlYWRlci15ICs9IG1tYW4t Y29tbW9uLmgKLWhlYWRlci15ICs9IG1tYW4uaAotaGVhZGVyLXkgKz0gbXNnYnVmLmgKLWhlYWRl ci15ICs9IHBhcmFtLmgKLWhlYWRlci15ICs9IHBvbGwuaAotaGVhZGVyLXkgKz0gcG9zaXhfdHlw ZXMuaAotaGVhZGVyLXkgKz0gcmVzb3VyY2UuaAotaGVhZGVyLXkgKz0gc2VtYnVmLmgKLWhlYWRl ci15ICs9IHNldHVwLmgKLWhlYWRlci15ICs9IHNobWJ1Zi5oCi1oZWFkZXIteSArPSBzaG1wYXJh bS5oCi1oZWFkZXIteSArPSBzaWdpbmZvLmgKLWhlYWRlci15ICs9IHNpZ25hbC1kZWZzLmgKLWhl YWRlci15ICs9IHNpZ25hbC5oCi1oZWFkZXIteSArPSBzb2NrZXQuaAotaGVhZGVyLXkgKz0gc29j a2lvcy5oCi1oZWFkZXIteSArPSBzdGF0LmgKLWhlYWRlci15ICs9IHN0YXRmcy5oCi1oZWFkZXIt eSArPSBzd2FiLmgKLWhlYWRlci15ICs9IHRlcm1iaXRzLmgKLWhlYWRlci15ICs9IHRlcm1pb3Mu aAotaGVhZGVyLXkgKz0gdHlwZXMuaAotaGVhZGVyLXkgKz0gdWNvbnRleHQuaAotaGVhZGVyLXkg Kz0gdW5pc3RkLmgKZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVpbGQu YXNtIGIvaW5jbHVkZS91YXBpL2FzbS1nZW5lcmljL0tidWlsZC5hc20KaW5kZXggZmNkNTBiNzU5 MjE3Li5jMTM4MDVkNWEyYTAgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9L YnVpbGQuYXNtCisrKyBiL2luY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVpbGQuYXNtCkBAIC04 LDM4ICs4LDM4IEBAIG9wdC1oZWFkZXIgKz0gYS5vdXQuaAogIwogIyBIZWFkZXJzIHRoYXQgYXJl IG1hbmRhdG9yeSBpbiB1c3IvaW5jbHVkZS9hc20vCiAjCi1oZWFkZXIteSArPSBhdXh2ZWMuaAot aGVhZGVyLXkgKz0gYml0c3BlcmxvbmcuaAotaGVhZGVyLXkgKz0gYnl0ZW9yZGVyLmgKLWhlYWRl ci15ICs9IGVycm5vLmgKLWhlYWRlci15ICs9IGZjbnRsLmgKLWhlYWRlci15ICs9IGlvY3RsLmgK LWhlYWRlci15ICs9IGlvY3Rscy5oCi1oZWFkZXIteSArPSBpcGNidWYuaAotaGVhZGVyLXkgKz0g bW1hbi5oCi1oZWFkZXIteSArPSBtc2didWYuaAotaGVhZGVyLXkgKz0gcGFyYW0uaAotaGVhZGVy LXkgKz0gcG9sbC5oCi1oZWFkZXIteSArPSBwb3NpeF90eXBlcy5oCi1oZWFkZXIteSArPSBwdHJh Y2UuaAotaGVhZGVyLXkgKz0gcmVzb3VyY2UuaAotaGVhZGVyLXkgKz0gc2VtYnVmLmgKLWhlYWRl ci15ICs9IHNldHVwLmgKLWhlYWRlci15ICs9IHNobWJ1Zi5oCi1oZWFkZXIteSArPSBzaWdjb250 ZXh0LmgKLWhlYWRlci15ICs9IHNpZ2luZm8uaAotaGVhZGVyLXkgKz0gc2lnbmFsLmgKLWhlYWRl ci15ICs9IHNvY2tldC5oCi1oZWFkZXIteSArPSBzb2NraW9zLmgKLWhlYWRlci15ICs9IHN0YXQu aAotaGVhZGVyLXkgKz0gc3RhdGZzLmgKLWhlYWRlci15ICs9IHN3YWIuaAotaGVhZGVyLXkgKz0g dGVybWJpdHMuaAotaGVhZGVyLXkgKz0gdGVybWlvcy5oCi1oZWFkZXIteSArPSB0eXBlcy5oCi1o ZWFkZXIteSArPSB1bmlzdGQuaAorZ2VuZXJpYy15ICs9IGF1eHZlYy5oCitnZW5lcmljLXkgKz0g Yml0c3BlcmxvbmcuaAorZ2VuZXJpYy15ICs9IGJ5dGVvcmRlci5oCitnZW5lcmljLXkgKz0gZXJy bm8uaAorZ2VuZXJpYy15ICs9IGZjbnRsLmgKK2dlbmVyaWMteSArPSBpb2N0bC5oCitnZW5lcmlj LXkgKz0gaW9jdGxzLmgKK2dlbmVyaWMteSArPSBpcGNidWYuaAorZ2VuZXJpYy15ICs9IG1tYW4u aAorZ2VuZXJpYy15ICs9IG1zZ2J1Zi5oCitnZW5lcmljLXkgKz0gcGFyYW0uaAorZ2VuZXJpYy15 ICs9IHBvbGwuaAorZ2VuZXJpYy15ICs9IHBvc2l4X3R5cGVzLmgKK2dlbmVyaWMteSArPSBwdHJh Y2UuaAorZ2VuZXJpYy15ICs9IHJlc291cmNlLmgKK2dlbmVyaWMteSArPSBzZW1idWYuaAorZ2Vu ZXJpYy15ICs9IHNldHVwLmgKK2dlbmVyaWMteSArPSBzaG1idWYuaAorZ2VuZXJpYy15ICs9IHNp Z2NvbnRleHQuaAorZ2VuZXJpYy15ICs9IHNpZ2luZm8uaAorZ2VuZXJpYy15ICs9IHNpZ25hbC5o CitnZW5lcmljLXkgKz0gc29ja2V0LmgKK2dlbmVyaWMteSArPSBzb2NraW9zLmgKK2dlbmVyaWMt eSArPSBzdGF0LmgKK2dlbmVyaWMteSArPSBzdGF0ZnMuaAorZ2VuZXJpYy15ICs9IHN3YWIuaAor Z2VuZXJpYy15ICs9IHRlcm1iaXRzLmgKK2dlbmVyaWMteSArPSB0ZXJtaW9zLmgKK2dlbmVyaWMt eSArPSB0eXBlcy5oCitnZW5lcmljLXkgKz0gdW5pc3RkLmgKIAotaGVhZGVyLXkgKz0gJChmb3Jl YWNoIGhkciwkKG9wdC1oZWFkZXIpLCBcCitnZW5lcmljLXkgKz0gJChmb3JlYWNoIGhkciwkKG9w dC1oZWFkZXIpLCBcCiAJICAgICAgJChpZiBcCiAJCSQod2lsZGNhcmQgXAogCQkJJChzcmN0cmVl KS9hcmNoLyQoU1JDQVJDSCkvaW5jbHVkZS91YXBpL2FzbS8kKGhkcikgXApkaWZmIC0tZ2l0IGEv aW5jbHVkZS91YXBpL2RybS9LYnVpbGQgYi9pbmNsdWRlL3VhcGkvZHJtL0tidWlsZApkZWxldGVk IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggOTM1NWRkOGVmZjNiLi4wMDAwMDAwMDAwMDAKLS0tIGEv aW5jbHVkZS91YXBpL2RybS9LYnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSwyMiArMCwwIEBACi0j IFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBkcm0uaAotaGVhZGVyLXkgKz0g ZHJtX2ZvdXJjYy5oCi1oZWFkZXIteSArPSBkcm1fbW9kZS5oCi1oZWFkZXIteSArPSBkcm1fc2Fy ZWEuaAotaGVhZGVyLXkgKz0gYW1kZ3B1X2RybS5oCi1oZWFkZXIteSArPSBleHlub3NfZHJtLmgK LWhlYWRlci15ICs9IGk4MTBfZHJtLmgKLWhlYWRlci15ICs9IGk5MTVfZHJtLmgKLWhlYWRlci15 ICs9IG1nYV9kcm0uaAotaGVhZGVyLXkgKz0gbm91dmVhdV9kcm0uaAotaGVhZGVyLXkgKz0gcXhs X2RybS5oCi1oZWFkZXIteSArPSByMTI4X2RybS5oCi1oZWFkZXIteSArPSByYWRlb25fZHJtLmgK LWhlYWRlci15ICs9IHNhdmFnZV9kcm0uaAotaGVhZGVyLXkgKz0gc2lzX2RybS5oCi1oZWFkZXIt eSArPSB0ZWdyYV9kcm0uaAotaGVhZGVyLXkgKz0gdmlhX2RybS5oCi1oZWFkZXIteSArPSB2bXdn ZnhfZHJtLmgKLWhlYWRlci15ICs9IG1zbV9kcm0uaAotaGVhZGVyLXkgKz0gdmM0X2RybS5oCi1o ZWFkZXIteSArPSB2aXJ0Z3B1X2RybS5oCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvbGludXgv S2J1aWxkIGIvaW5jbHVkZS91YXBpL2xpbnV4L0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggYThiOTNlNjg1MjM5Li4wMDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS91YXBpL2xp bnV4L0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDQ4MiArMCwwIEBACi0jIFVBUEkgSGVhZGVy IGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBhbmRyb2lkLwotaGVhZGVyLXkgKz0gYnl0ZW9yZGVy LwotaGVhZGVyLXkgKz0gY2FuLwotaGVhZGVyLXkgKz0gY2FpZi8KLWhlYWRlci15ICs9IGR2Yi8K LWhlYWRlci15ICs9IGhkbGMvCi1oZWFkZXIteSArPSBoc2kvCi1oZWFkZXIteSArPSBpaW8vCi1o ZWFkZXIteSArPSBpc2RuLwotaGVhZGVyLXkgKz0gbW1jLwotaGVhZGVyLXkgKz0gbmZzZC8KLWhl YWRlci15ICs9IHJhaWQvCi1oZWFkZXIteSArPSBzcGkvCi1oZWFkZXIteSArPSBzdW5ycGMvCi1o ZWFkZXIteSArPSB0Y19hY3QvCi1oZWFkZXIteSArPSB0Y19lbWF0Y2gvCi1oZWFkZXIteSArPSBu ZXRmaWx0ZXIvCi1oZWFkZXIteSArPSBuZXRmaWx0ZXJfYXJwLwotaGVhZGVyLXkgKz0gbmV0Zmls dGVyX2JyaWRnZS8KLWhlYWRlci15ICs9IG5ldGZpbHRlcl9pcHY0LwotaGVhZGVyLXkgKz0gbmV0 ZmlsdGVyX2lwdjYvCi1oZWFkZXIteSArPSB1c2IvCi1oZWFkZXIteSArPSB3aW1heC8KLQotZ2Vu aGRyLXkgKz0gdmVyc2lvbi5oCi0KLWlmbmVxICgkKHdpbGRjYXJkICQoc3JjdHJlZSkvYXJjaC8k KFNSQ0FSQ0gpL2luY2x1ZGUvdWFwaS9hc20vYS5vdXQuaCBcCi0JCSAgJChzcmN0cmVlKS9hcmNo LyQoU1JDQVJDSCkvaW5jbHVkZS9hc20vYS5vdXQuaCksKQotaGVhZGVyLXkgKz0gYS5vdXQuaAot ZW5kaWYKLQotaGVhZGVyLXkgKz0gYWNjdC5oCi1oZWFkZXIteSArPSBhZGIuaAotaGVhZGVyLXkg Kz0gYWRmc19mcy5oCi1oZWFkZXIteSArPSBhZmZzX2hhcmRibG9ja3MuaAotaGVhZGVyLXkgKz0g YWdwZ2FydC5oCi1oZWFkZXIteSArPSBhaW9fYWJpLmgKLWhlYWRlci15ICs9IGFtNDM3eC12cGZl LmgKLWhlYWRlci15ICs9IGFwbV9iaW9zLmgKLWhlYWRlci15ICs9IGFyY2ZiLmgKLWhlYWRlci15 ICs9IGF0YWxrLmgKLWhlYWRlci15ICs9IGF0bWFwaS5oCi1oZWFkZXIteSArPSBhdG1hcnAuaAot aGVhZGVyLXkgKz0gYXRtYnIyNjg0LmgKLWhlYWRlci15ICs9IGF0bWNsaXAuaAotaGVhZGVyLXkg Kz0gYXRtZGV2LmgKLWhlYWRlci15ICs9IGF0bV9lbmkuaAotaGVhZGVyLXkgKz0gYXRtLmgKLWhl YWRlci15ICs9IGF0bV9oZS5oCi1oZWFkZXIteSArPSBhdG1faWR0NzcxMDUuaAotaGVhZGVyLXkg Kz0gYXRtaW9jLmgKLWhlYWRlci15ICs9IGF0bWxlYy5oCi1oZWFkZXIteSArPSBhdG1tcGMuaAot aGVhZGVyLXkgKz0gYXRtX25pY3N0YXIuaAotaGVhZGVyLXkgKz0gYXRtcHBwLmgKLWhlYWRlci15 ICs9IGF0bXNhcC5oCi1oZWFkZXIteSArPSBhdG1zdmMuaAotaGVhZGVyLXkgKz0gYXRtX3RjcC5o Ci1oZWFkZXIteSArPSBhdG1femF0bS5oCi1oZWFkZXIteSArPSBhdWRpdC5oCi1oZWFkZXIteSAr PSBhdXRvX2ZzNC5oCi1oZWFkZXIteSArPSBhdXRvX2ZzLmgKLWhlYWRlci15ICs9IGF1eHZlYy5o Ci1oZWFkZXIteSArPSBheDI1LmgKLWhlYWRlci15ICs9IGIxbGxpLmgKLWhlYWRlci15ICs9IGJh eWNvbS5oCi1oZWFkZXIteSArPSBiY205MzN4eF9oY3MuaAotaGVhZGVyLXkgKz0gYmZzX2ZzLmgK LWhlYWRlci15ICs9IGJpbmZtdHMuaAotaGVhZGVyLXkgKz0gYmxrcGcuaAotaGVhZGVyLXkgKz0g YmxrdHJhY2VfYXBpLmgKLWhlYWRlci15ICs9IGJsa3pvbmVkLmgKLWhlYWRlci15ICs9IGJwZl9j b21tb24uaAotaGVhZGVyLXkgKz0gYnBmX3BlcmZfZXZlbnQuaAotaGVhZGVyLXkgKz0gYnBmLmgK LWhlYWRlci15ICs9IGJwcWV0aGVyLmgKLWhlYWRlci15ICs9IGJzZy5oCi1oZWFkZXIteSArPSBi dC1ibWMuaAotaGVhZGVyLXkgKz0gYnRyZnMuaAotaGVhZGVyLXkgKz0gY2FuLmgKLWhlYWRlci15 ICs9IGNhcGFiaWxpdHkuaAotaGVhZGVyLXkgKz0gY2FwaS5oCi1oZWFkZXIteSArPSBjY2lzc19k ZWZzLmgKLWhlYWRlci15ICs9IGNjaXNzX2lvY3RsLmgKLWhlYWRlci15ICs9IGNkcm9tLmgKLWhl YWRlci15ICs9IGNlYy5oCi1oZWFkZXIteSArPSBjZWMtZnVuY3MuaAotaGVhZGVyLXkgKz0gY2dy b3Vwc3RhdHMuaAotaGVhZGVyLXkgKz0gY2hpby5oCi1oZWFkZXIteSArPSBjbTQwMDBfY3MuaAot aGVhZGVyLXkgKz0gY25fcHJvYy5oCi1oZWFkZXIteSArPSBjb2RhLmgKLWhlYWRlci15ICs9IGNv ZGFfcHNkZXYuaAotaGVhZGVyLXkgKz0gY29mZi5oCi1oZWFkZXIteSArPSBjb25uZWN0b3IuaAot aGVhZGVyLXkgKz0gY29uc3QuaAotaGVhZGVyLXkgKz0gY3JhbWZzX2ZzLmgKLWhlYWRlci15ICs9 IGN1ZGEuaAotaGVhZGVyLXkgKz0gY3ljbGFkZXMuaAotaGVhZGVyLXkgKz0gY3ljeF9jZm0uaAot aGVhZGVyLXkgKz0gZGNibmwuaAotaGVhZGVyLXkgKz0gZGNjcC5oCi1oZWFkZXIteSArPSBkZXZs aW5rLmgKLWhlYWRlci15ICs9IGRsbWNvbnN0YW50cy5oCi1oZWFkZXIteSArPSBkbG1fZGV2aWNl LmgKLWhlYWRlci15ICs9IGRsbS5oCi1oZWFkZXIteSArPSBkbG1fbmV0bGluay5oCi1oZWFkZXIt eSArPSBkbG1fcGxvY2suaAotaGVhZGVyLXkgKz0gZG0taW9jdGwuaAotaGVhZGVyLXkgKz0gZG0t bG9nLXVzZXJzcGFjZS5oCi1oZWFkZXIteSArPSBkbi5oCi1oZWFkZXIteSArPSBkcWJsa194ZnMu aAotaGVhZGVyLXkgKz0gZWRkLmgKLWhlYWRlci15ICs9IGVmc19mc19zYi5oCi1oZWFkZXIteSAr PSBlbGZjb3JlLmgKLWhlYWRlci15ICs9IGVsZi1lbS5oCi1oZWFkZXIteSArPSBlbGYtZmRwaWMu aAotaGVhZGVyLXkgKz0gZWxmLmgKLWhlYWRlci15ICs9IGVycm5vLmgKLWhlYWRlci15ICs9IGVy cnF1ZXVlLmgKLWhlYWRlci15ICs9IGV0aHRvb2wuaAotaGVhZGVyLXkgKz0gZXZlbnRwb2xsLmgK LWhlYWRlci15ICs9IGZhZHZpc2UuaAotaGVhZGVyLXkgKz0gZmFsbG9jLmgKLWhlYWRlci15ICs9 IGZhbm90aWZ5LmgKLWhlYWRlci15ICs9IGZiLmgKLWhlYWRlci15ICs9IGZjbnRsLmgKLWhlYWRl ci15ICs9IGZkLmgKLWhlYWRlci15ICs9IGZkcmVnLmgKLWhlYWRlci15ICs9IGZpYl9ydWxlcy5o Ci1oZWFkZXIteSArPSBmaWVtYXAuaAotaGVhZGVyLXkgKz0gZmlsdGVyLmgKLWhlYWRlci15ICs9 IGZpcmV3aXJlLWNkZXYuaAotaGVhZGVyLXkgKz0gZmlyZXdpcmUtY29uc3RhbnRzLmgKLWhlYWRl ci15ICs9IGZsYXQuaAotaGVhZGVyLXkgKz0gZm91LmgKLWhlYWRlci15ICs9IGZzLmgKLWhlYWRl ci15ICs9IGZzbF9oeXBlcnZpc29yLmgKLWhlYWRlci15ICs9IGZ1c2UuaAotaGVhZGVyLXkgKz0g ZnV0ZXguaAotaGVhZGVyLXkgKz0gZ2FtZXBvcnQuaAotaGVhZGVyLXkgKz0gZ2VuZXRsaW5rLmgK LWhlYWRlci15ICs9IGdlbl9zdGF0cy5oCi1oZWFkZXIteSArPSBnZnMyX29uZGlzay5oCi1oZWFk ZXIteSArPSBnaWdhc2V0X2Rldi5oCi1oZWFkZXIteSArPSBncGlvLmgKLWhlYWRlci15ICs9IGdz bW11eC5oCi1oZWFkZXIteSArPSBndHAuaAotaGVhZGVyLXkgKz0gaGRsY2Rydi5oCi1oZWFkZXIt eSArPSBoZGxjLmgKLWhlYWRlci15ICs9IGhkcmVnLmgKLWhlYWRlci15ICs9IGhpZGRldi5oCi1o ZWFkZXIteSArPSBoaWQuaAotaGVhZGVyLXkgKz0gaGlkcmF3LmgKLWhlYWRlci15ICs9IGhwZXQu aAotaGVhZGVyLXkgKz0gaHNyX25ldGxpbmsuaAotaGVhZGVyLXkgKz0gaHlwZXJ2LmgKLWhlYWRl ci15ICs9IGh5c2RuX2lmLmgKLWhlYWRlci15ICs9IGkyYy1kZXYuaAotaGVhZGVyLXkgKz0gaTJj LmgKLWhlYWRlci15ICs9IGkyby1kZXYuaAotaGVhZGVyLXkgKz0gaThrLmgKLWhlYWRlci15ICs9 IGljbXAuaAotaGVhZGVyLXkgKz0gaWNtcHY2LmgKLWhlYWRlci15ICs9IGlmX2FkZHIuaAotaGVh ZGVyLXkgKz0gaWZfYWRkcmxhYmVsLmgKLWhlYWRlci15ICs9IGlmX2FsZy5oCi1oZWFkZXIteSAr PSBpZl9hcmNuZXQuaAotaGVhZGVyLXkgKz0gaWZfYXJwLmgKLWhlYWRlci15ICs9IGlmX2JvbmRp bmcuaAotaGVhZGVyLXkgKz0gaWZfYnJpZGdlLmgKLWhlYWRlci15ICs9IGlmX2NhYmxlbW9kZW0u aAotaGVhZGVyLXkgKz0gaWZfZXFsLmgKLWhlYWRlci15ICs9IGlmX2V0aGVyLmgKLWhlYWRlci15 ICs9IGlmX2ZjLmgKLWhlYWRlci15ICs9IGlmX2ZkZGkuaAotaGVhZGVyLXkgKz0gaWZfZnJhZC5o Ci1oZWFkZXIteSArPSBpZi5oCi1oZWFkZXIteSArPSBpZl9oaXBwaS5oCi1oZWFkZXIteSArPSBp Zl9pbmZpbmliYW5kLmgKLWhlYWRlci15ICs9IGlmX2xpbmsuaAotaGVhZGVyLXkgKz0gaWZfbHRh bGsuaAotaGVhZGVyLXkgKz0gaWZfbWFjc2VjLmgKLWhlYWRlci15ICs9IGlmX3BhY2tldC5oCi1o ZWFkZXIteSArPSBpZl9waG9uZXQuaAotaGVhZGVyLXkgKz0gaWZfcGxpcC5oCi1oZWFkZXIteSAr PSBpZl9wcHAuaAotaGVhZGVyLXkgKz0gaWZfcHBwb2wydHAuaAotaGVhZGVyLXkgKz0gaWZfcHBw b3guaAotaGVhZGVyLXkgKz0gaWZfc2xpcC5oCi1oZWFkZXIteSArPSBpZl90ZWFtLmgKLWhlYWRl ci15ICs9IGlmX3R1bi5oCi1oZWFkZXIteSArPSBpZl90dW5uZWwuaAotaGVhZGVyLXkgKz0gaWZf dmxhbi5oCi1oZWFkZXIteSArPSBpZl94MjUuaAotaGVhZGVyLXkgKz0gaWdtcC5oCi1oZWFkZXIt eSArPSBpbGEuaAotaGVhZGVyLXkgKz0gaW42LmgKLWhlYWRlci15ICs9IGluZXRfZGlhZy5oCi1o ZWFkZXIteSArPSBpbi5oCi1oZWFkZXIteSArPSBpbm90aWZ5LmgKLWhlYWRlci15ICs9IGlucHV0 LmgKLWhlYWRlci15ICs9IGlucHV0LWV2ZW50LWNvZGVzLmgKLWhlYWRlci15ICs9IGluX3JvdXRl LmgKLWhlYWRlci15ICs9IGlvY3RsLmgKLWhlYWRlci15ICs9IGlwNl90dW5uZWwuaAotaGVhZGVy LXkgKz0gaXBjLmgKLWhlYWRlci15ICs9IGlwLmgKLWhlYWRlci15ICs9IGlwbWkuaAotaGVhZGVy LXkgKz0gaXBtaV9tc2dkZWZzLmgKLWhlYWRlci15ICs9IGlwc2VjLmgKLWhlYWRlci15ICs9IGlw djYuaAotaGVhZGVyLXkgKz0gaXB2Nl9yb3V0ZS5oCi1oZWFkZXIteSArPSBpcF92cy5oCi1oZWFk ZXIteSArPSBpcHguaAotaGVhZGVyLXkgKz0gaXJkYS5oCi1oZWFkZXIteSArPSBpcnFuci5oCi1o ZWFkZXIteSArPSBpc2RuX2RpdmVydGlmLmgKLWhlYWRlci15ICs9IGlzZG4uaAotaGVhZGVyLXkg Kz0gaXNkbmlmLmgKLWhlYWRlci15ICs9IGlzZG5fcHBwLmgKLWhlYWRlci15ICs9IGlzb19mcy5o Ci1oZWFkZXIteSArPSBpdnR2ZmIuaAotaGVhZGVyLXkgKz0gaXZ0di5oCi1oZWFkZXIteSArPSBp eGp1c2VyLmgKLWhlYWRlci15ICs9IGpmZnMyLmgKLWhlYWRlci15ICs9IGpveXN0aWNrLmgKLWhl YWRlci15ICs9IGtjbXAuaAotaGVhZGVyLXkgKz0ga2Rldl90LmgKLWhlYWRlci15ICs9IGtkLmgK LWhlYWRlci15ICs9IGtlcm5lbGNhcGkuaAotaGVhZGVyLXkgKz0ga2VybmVsLmgKLWhlYWRlci15 ICs9IGtlcm5lbC1wYWdlLWZsYWdzLmgKLWhlYWRlci15ICs9IGtleGVjLmgKLWhlYWRlci15ICs9 IGtleWJvYXJkLmgKLWhlYWRlci15ICs9IGtleWN0bC5oCi0KLWlmbmVxICgkKHdpbGRjYXJkICQo c3JjdHJlZSkvYXJjaC8kKFNSQ0FSQ0gpL2luY2x1ZGUvdWFwaS9hc20va3ZtLmggXAotCQkgICQo c3JjdHJlZSkvYXJjaC8kKFNSQ0FSQ0gpL2luY2x1ZGUvYXNtL2t2bS5oKSwpCi1oZWFkZXIteSAr PSBrdm0uaAotZW5kaWYKLQotCi1pZm5lcSAoJCh3aWxkY2FyZCAkKHNyY3RyZWUpL2FyY2gvJChT UkNBUkNIKS9pbmNsdWRlL3VhcGkvYXNtL2t2bV9wYXJhLmggXAotCQkgICQoc3JjdHJlZSkvYXJj aC8kKFNSQ0FSQ0gpL2luY2x1ZGUvYXNtL2t2bV9wYXJhLmgpLCkKLWhlYWRlci15ICs9IGt2bV9w YXJhLmgKLWVuZGlmCi0KLWhlYWRlci15ICs9IGh3X2JyZWFrcG9pbnQuaAotaGVhZGVyLXkgKz0g bDJ0cC5oCi1oZWFkZXIteSArPSBsaWJjLWNvbXBhdC5oCi1oZWFkZXIteSArPSBsaXJjLmgKLWhl YWRlci15ICs9IGxpbWl0cy5oCi1oZWFkZXIteSArPSBsbGMuaAotaGVhZGVyLXkgKz0gbG9vcC5o Ci1oZWFkZXIteSArPSBscC5oCi1oZWFkZXIteSArPSBsd3R1bm5lbC5oCi1oZWFkZXIteSArPSBt YWdpYy5oCi1oZWFkZXIteSArPSBtYWpvci5oCi1oZWFkZXIteSArPSBtYXBfdG9fN3NlZ21lbnQu aAotaGVhZGVyLXkgKz0gbWF0cm94ZmIuaAotaGVhZGVyLXkgKz0gbWRpby5oCi1oZWFkZXIteSAr PSBtZWRpYS5oCi1oZWFkZXIteSArPSBtZWRpYS1idXMtZm9ybWF0LmgKLWhlYWRlci15ICs9IG1l aS5oCi1oZWFkZXIteSArPSBtZW1iYXJyaWVyLmgKLWhlYWRlci15ICs9IG1lbWZkLmgKLWhlYWRl ci15ICs9IG1lbXBvbGljeS5oCi1oZWFkZXIteSArPSBtZXllLmgKLWhlYWRlci15ICs9IG1pY19j b21tb24uaAotaGVhZGVyLXkgKz0gbWljX2lvY3RsLmgKLWhlYWRlci15ICs9IG1paS5oCi1oZWFk ZXIteSArPSBtaW5peF9mcy5oCi1oZWFkZXIteSArPSBtbWFuLmgKLWhlYWRlci15ICs9IG1tdGlt ZXIuaAotaGVhZGVyLXkgKz0gbXBscy5oCi1oZWFkZXIteSArPSBtcGxzX2lwdHVubmVsLmgKLWhl YWRlci15ICs9IG1xdWV1ZS5oCi1oZWFkZXIteSArPSBtcm91dGU2LmgKLWhlYWRlci15ICs9IG1y b3V0ZS5oCi1oZWFkZXIteSArPSBtc2Rvc19mcy5oCi1oZWFkZXIteSArPSBtc2cuaAotaGVhZGVy LXkgKz0gbXRpby5oCi1oZWFkZXIteSArPSBuYmQuaAotaGVhZGVyLXkgKz0gbmNwX2ZzLmgKLWhl YWRlci15ICs9IG5jcC5oCi1oZWFkZXIteSArPSBuY3BfbW91bnQuaAotaGVhZGVyLXkgKz0gbmNw X25vLmgKLWhlYWRlci15ICs9IG5kY3RsLmgKLWhlYWRlci15ICs9IG5laWdoYm91ci5oCi1oZWFk ZXIteSArPSBuZXRjb25mLmgKLWhlYWRlci15ICs9IG5ldGRldmljZS5oCi1oZWFkZXIteSArPSBu ZXRfZHJvcG1vbi5oCi1oZWFkZXIteSArPSBuZXRmaWx0ZXJfYXJwLmgKLWhlYWRlci15ICs9IG5l dGZpbHRlcl9icmlkZ2UuaAotaGVhZGVyLXkgKz0gbmV0ZmlsdGVyX2RlY25ldC5oCi1oZWFkZXIt eSArPSBuZXRmaWx0ZXIuaAotaGVhZGVyLXkgKz0gbmV0ZmlsdGVyX2lwdjQuaAotaGVhZGVyLXkg Kz0gbmV0ZmlsdGVyX2lwdjYuaAotaGVhZGVyLXkgKz0gbmV0LmgKLWhlYWRlci15ICs9IG5ldGxp bmtfZGlhZy5oCi1oZWFkZXIteSArPSBuZXRsaW5rLmgKLWhlYWRlci15ICs9IG5ldHJvbS5oCi1o ZWFkZXIteSArPSBuZXRfbmFtZXNwYWNlLmgKLWhlYWRlci15ICs9IG5ldF90c3RhbXAuaAotaGVh ZGVyLXkgKz0gbmZjLmgKLWhlYWRlci15ICs9IG5mczIuaAotaGVhZGVyLXkgKz0gbmZzMy5oCi1o ZWFkZXIteSArPSBuZnM0LmgKLWhlYWRlci15ICs9IG5mczRfbW91bnQuaAotaGVhZGVyLXkgKz0g bmZzYWNsLmgKLWhlYWRlci15ICs9IG5mc19mcy5oCi1oZWFkZXIteSArPSBuZnMuaAotaGVhZGVy LXkgKz0gbmZzX2lkbWFwLmgKLWhlYWRlci15ICs9IG5mc19tb3VudC5oCi1oZWFkZXIteSArPSBu bDgwMjExLmgKLWhlYWRlci15ICs9IG5fcjM5NjQuaAotaGVhZGVyLXkgKz0gbnVidXMuaAotaGVh ZGVyLXkgKz0gbnZtZV9pb2N0bC5oCi1oZWFkZXIteSArPSBudnJhbS5oCi1oZWFkZXIteSArPSBv bWFwM2lzcC5oCi1oZWFkZXIteSArPSBvbWFwZmIuaAotaGVhZGVyLXkgKz0gb29tLmgKLWhlYWRl ci15ICs9IG9wZW52c3dpdGNoLmgKLWhlYWRlci15ICs9IHBhY2tldF9kaWFnLmgKLWhlYWRlci15 ICs9IHBhcmFtLmgKLWhlYWRlci15ICs9IHBhcnBvcnQuaAotaGVhZGVyLXkgKz0gcGF0Y2hrZXku aAotaGVhZGVyLXkgKz0gcGNpLmgKLWhlYWRlci15ICs9IHBjaV9yZWdzLmgKLWhlYWRlci15ICs9 IHBlcmZfZXZlbnQuaAotaGVhZGVyLXkgKz0gcGVyc29uYWxpdHkuaAotaGVhZGVyLXkgKz0gcGZr ZXl2Mi5oCi1oZWFkZXIteSArPSBwZy5oCi1oZWFkZXIteSArPSBwaGFudG9tLmgKLWhlYWRlci15 ICs9IHBob25ldC5oCi1oZWFkZXIteSArPSBwa3RjZHZkLmgKLWhlYWRlci15ICs9IHBrdF9jbHMu aAotaGVhZGVyLXkgKz0gcGt0X3NjaGVkLmgKLWhlYWRlci15ICs9IHBtdS5oCi1oZWFkZXIteSAr PSBwb2xsLmgKLWhlYWRlci15ICs9IHBvc2l4X2FjbC5oCi1oZWFkZXIteSArPSBwb3NpeF9hY2xf eGF0dHIuaAotaGVhZGVyLXkgKz0gcG9zaXhfdHlwZXMuaAotaGVhZGVyLXkgKz0gcHBkZXYuaAot aGVhZGVyLXkgKz0gcHBwLWNvbXAuaAotaGVhZGVyLXkgKz0gcHBwX2RlZnMuaAotaGVhZGVyLXkg Kz0gcHBwLWlvY3RsLmgKLWhlYWRlci15ICs9IHBwcy5oCi1oZWFkZXIteSArPSBwcmN0bC5oCi1o ZWFkZXIteSArPSBwc2NpLmgKLWhlYWRlci15ICs9IHB0cF9jbG9jay5oCi1oZWFkZXIteSArPSBw dHJhY2UuaAotaGVhZGVyLXkgKz0gcW54NF9mcy5oCi1oZWFkZXIteSArPSBxbnh0eXBlcy5oCi1o ZWFkZXIteSArPSBxdW90YS5oCi1oZWFkZXIteSArPSByYWRlb25mYi5oCi1oZWFkZXIteSArPSBy YW5kb20uaAotaGVhZGVyLXkgKz0gcmF3LmgKLWhlYWRlci15ICs9IHJkcy5oCi1oZWFkZXIteSAr PSByZWJvb3QuaAotaGVhZGVyLXkgKz0gcmVpc2VyZnNfZnMuaAotaGVhZGVyLXkgKz0gcmVpc2Vy ZnNfeGF0dHIuaAotaGVhZGVyLXkgKz0gcmVzb3VyY2UuaAotaGVhZGVyLXkgKz0gcmZraWxsLmgK LWhlYWRlci15ICs9IHJpb19jbV9jZGV2LmgKLWhlYWRlci15ICs9IHJpb19tcG9ydF9jZGV2LmgK LWhlYWRlci15ICs9IHJvbWZzX2ZzLmgKLWhlYWRlci15ICs9IHJvc2UuaAotaGVhZGVyLXkgKz0g cm91dGUuaAotaGVhZGVyLXkgKz0gcnRjLmgKLWhlYWRlci15ICs9IHJ0bmV0bGluay5oCi1oZWFk ZXIteSArPSBzY2MuaAotaGVhZGVyLXkgKz0gc2NoZWQuaAotaGVhZGVyLXkgKz0gc2NpZl9pb2N0 bC5oCi1oZWFkZXIteSArPSBzY3JlZW5faW5mby5oCi1oZWFkZXIteSArPSBzY3RwLmgKLWhlYWRl ci15ICs9IHNkbGEuaAotaGVhZGVyLXkgKz0gc2VjY29tcC5oCi1oZWFkZXIteSArPSBzZWN1cmVi aXRzLmgKLWhlYWRlci15ICs9IHNlbGludXhfbmV0bGluay5oCi1oZWFkZXIteSArPSBzZW0uaAot aGVhZGVyLXkgKz0gc2VyaWFsX2NvcmUuaAotaGVhZGVyLXkgKz0gc2VyaWFsLmgKLWhlYWRlci15 ICs9IHNlcmlhbF9yZWcuaAotaGVhZGVyLXkgKz0gc2VyaW8uaAotaGVhZGVyLXkgKz0gc2htLmgK LWhlYWRlci15ICs9IHNpZ25hbGZkLmgKLWhlYWRlci15ICs9IHNpZ25hbC5oCi1oZWFkZXIteSAr PSBzbWlhcHAuaAotaGVhZGVyLXkgKz0gc25tcC5oCi1oZWFkZXIteSArPSBzb2NrX2RpYWcuaAot aGVhZGVyLXkgKz0gc29ja2V0LmgKLWhlYWRlci15ICs9IHNvY2tpb3MuaAotaGVhZGVyLXkgKz0g c29uZXQuaAotaGVhZGVyLXkgKz0gc29ueXBpLmgKLWhlYWRlci15ICs9IHNvdW5kY2FyZC5oCi1o ZWFkZXIteSArPSBzb3VuZC5oCi1oZWFkZXIteSArPSBzdGF0LmgKLWhlYWRlci15ICs9IHN0ZGRl Zi5oCi1oZWFkZXIteSArPSBzdHJpbmcuaAotaGVhZGVyLXkgKz0gc3VzcGVuZF9pb2N0bHMuaAot aGVhZGVyLXkgKz0gc3dhYi5oCi1oZWFkZXIteSArPSBzeW5jbGluay5oCi1oZWFkZXIteSArPSBz eW5jX2ZpbGUuaAotaGVhZGVyLXkgKz0gc3lzY3RsLmgKLWhlYWRlci15ICs9IHN5c2luZm8uaAot aGVhZGVyLXkgKz0gdGFyZ2V0X2NvcmVfdXNlci5oCi1oZWFkZXIteSArPSB0YXNrc3RhdHMuaAot aGVhZGVyLXkgKz0gdGNwLmgKLWhlYWRlci15ICs9IHRjcF9tZXRyaWNzLmgKLWhlYWRlci15ICs9 IHRlbGVwaG9ueS5oCi1oZWFkZXIteSArPSB0ZXJtaW9zLmgKLWhlYWRlci15ICs9IHRoZXJtYWwu aAotaGVhZGVyLXkgKz0gdGltZS5oCi1oZWFkZXIteSArPSB0aW1lcy5oCi1oZWFkZXIteSArPSB0 aW1leC5oCi1oZWFkZXIteSArPSB0aW9jbC5oCi1oZWFkZXIteSArPSB0aXBjX2NvbmZpZy5oCi1o ZWFkZXIteSArPSB0aXBjX25ldGxpbmsuaAotaGVhZGVyLXkgKz0gdGlwYy5oCi1oZWFkZXIteSAr PSB0b3NoaWJhLmgKLWhlYWRlci15ICs9IHR0eV9mbGFncy5oCi1oZWFkZXIteSArPSB0dHkuaAot aGVhZGVyLXkgKz0gdHlwZXMuaAotaGVhZGVyLXkgKz0gdWRmX2ZzX2kuaAotaGVhZGVyLXkgKz0g dWRwLmgKLWhlYWRlci15ICs9IHVoaWQuaAotaGVhZGVyLXkgKz0gdWlucHV0LmgKLWhlYWRlci15 ICs9IHVpby5oCi1oZWFkZXIteSArPSB1bGVkcy5oCi1oZWFkZXIteSArPSB1bHRyYXNvdW5kLmgK LWhlYWRlci15ICs9IHVuLmgKLWhlYWRlci15ICs9IHVuaXN0ZC5oCi1oZWFkZXIteSArPSB1bml4 X2RpYWcuaAotaGVhZGVyLXkgKz0gdXNiZGV2aWNlX2ZzLmgKLWhlYWRlci15ICs9IHVzYmlwLmgK LWhlYWRlci15ICs9IHV0aW1lLmgKLWhlYWRlci15ICs9IHV0c25hbWUuaAotaGVhZGVyLXkgKz0g dXVpZC5oCi1oZWFkZXIteSArPSB1dmN2aWRlby5oCi1oZWFkZXIteSArPSB2NGwyLWNvbW1vbi5o Ci1oZWFkZXIteSArPSB2NGwyLWNvbnRyb2xzLmgKLWhlYWRlci15ICs9IHY0bDItZHYtdGltaW5n cy5oCi1oZWFkZXIteSArPSB2NGwyLW1lZGlhYnVzLmgKLWhlYWRlci15ICs9IHY0bDItc3ViZGV2 LmgKLWhlYWRlci15ICs9IHZldGguaAotaGVhZGVyLXkgKz0gdmZpby5oCi1oZWFkZXIteSArPSB2 aG9zdC5oCi1oZWFkZXIteSArPSB2aWRlb2RldjIuaAotaGVhZGVyLXkgKz0gdmlydGlvXzlwLmgK LWhlYWRlci15ICs9IHZpcnRpb19iYWxsb29uLmgKLWhlYWRlci15ICs9IHZpcnRpb19ibGsuaAot aGVhZGVyLXkgKz0gdmlydGlvX2NvbmZpZy5oCi1oZWFkZXIteSArPSB2aXJ0aW9fY29uc29sZS5o Ci1oZWFkZXIteSArPSB2aXJ0aW9fZ3B1LmgKLWhlYWRlci15ICs9IHZpcnRpb19pZHMuaAotaGVh ZGVyLXkgKz0gdmlydGlvX2lucHV0LmgKLWhlYWRlci15ICs9IHZpcnRpb19uZXQuaAotaGVhZGVy LXkgKz0gdmlydGlvX3BjaS5oCi1oZWFkZXIteSArPSB2aXJ0aW9fcmluZy5oCi1oZWFkZXIteSAr PSB2aXJ0aW9fcm5nLmgKLWhlYWRlci15ICs9IHZpcnRpb19zY3NpLmgKLWhlYWRlci15ICs9IHZp cnRpb190eXBlcy5oCi1oZWFkZXIteSArPSB2aXJ0aW9fdnNvY2suaAotaGVhZGVyLXkgKz0gdmly dGlvX2NyeXB0by5oCi1oZWFkZXIteSArPSB2bV9zb2NrZXRzLmgKLWhlYWRlci15ICs9IHZ0LmgK LWhlYWRlci15ICs9IHZ0cG1fcHJveHkuaAotaGVhZGVyLXkgKz0gd2FpdC5oCi1oZWFkZXIteSAr PSB3YW5yb3V0ZXIuaAotaGVhZGVyLXkgKz0gd2F0Y2hkb2cuaAotaGVhZGVyLXkgKz0gd2ltYXgu aAotaGVhZGVyLXkgKz0gd2lyZWxlc3MuaAotaGVhZGVyLXkgKz0geDI1LmgKLWhlYWRlci15ICs9 IHhhdHRyLmgKLWhlYWRlci15ICs9IHhmcm0uaAotaGVhZGVyLXkgKz0geGlsaW54LXY0bDItY29u dHJvbHMuaAotaGVhZGVyLXkgKz0gem9ycm8uaAotaGVhZGVyLXkgKz0gem9ycm9faWRzLmgKLWhl YWRlci15ICs9IHVzZXJmYXVsdGZkLmgKZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9saW51eC9h bmRyb2lkL0tidWlsZCBiL2luY2x1ZGUvdWFwaS9saW51eC9hbmRyb2lkL0tidWlsZApkZWxldGVk IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggY2EwMTFlZWMyNTJhLi4wMDAwMDAwMDAwMDAKLS0tIGEv aW5jbHVkZS91YXBpL2xpbnV4L2FuZHJvaWQvS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsMiAr MCwwIEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBiaW5kZXIuaApk aWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2xpbnV4L2J5dGVvcmRlci9LYnVpbGQgYi9pbmNsdWRl L3VhcGkvbGludXgvYnl0ZW9yZGVyL0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggNjE5MjI1YjlmZjJlLi4wMDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS91YXBpL2xpbnV4L2J5 dGVvcmRlci9LYnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSwzICswLDAgQEAKLSMgVUFQSSBIZWFk ZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IGJpZ19lbmRpYW4uaAotaGVhZGVyLXkgKz0gbGl0 dGxlX2VuZGlhbi5oCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvbGludXgvY2FpZi9LYnVpbGQg Yi9pbmNsdWRlL3VhcGkvbGludXgvY2FpZi9LYnVpbGQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDQzMzk2NjEyZDNhMy4uMDAwMDAwMDAwMDAwCi0tLSBhL2luY2x1ZGUvdWFwaS9saW51 eC9jYWlmL0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDMgKzAsMCBAQAotIyBVQVBJIEhlYWRl ciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gY2FpZl9zb2NrZXQuaAotaGVhZGVyLXkgKz0gaWZf Y2FpZi5oCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvbGludXgvY2FuL0tidWlsZCBiL2luY2x1 ZGUvdWFwaS9saW51eC9jYW4vS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAy MWM5MWJmMjVhMjkuLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL3VhcGkvbGludXgvY2FuL0ti dWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDYgKzAsMCBAQAotIyBVQVBJIEhlYWRlciBleHBvcnQg bGlzdAotaGVhZGVyLXkgKz0gYmNtLmgKLWhlYWRlci15ICs9IGVycm9yLmgKLWhlYWRlci15ICs9 IGd3LmgKLWhlYWRlci15ICs9IG5ldGxpbmsuaAotaGVhZGVyLXkgKz0gcmF3LmgKZGlmZiAtLWdp dCBhL2luY2x1ZGUvdWFwaS9saW51eC9kdmIvS2J1aWxkIGIvaW5jbHVkZS91YXBpL2xpbnV4L2R2 Yi9LYnVpbGQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGQ0MDk0MmNmYzYyNy4uMDAw MDAwMDAwMDAwCi0tLSBhL2luY2x1ZGUvdWFwaS9saW51eC9kdmIvS2J1aWxkCisrKyAvZGV2L251 bGwKQEAgLTEsOSArMCwwIEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSAr PSBhdWRpby5oCi1oZWFkZXIteSArPSBjYS5oCi1oZWFkZXIteSArPSBkbXguaAotaGVhZGVyLXkg Kz0gZnJvbnRlbmQuaAotaGVhZGVyLXkgKz0gbmV0LmgKLWhlYWRlci15ICs9IG9zZC5oCi1oZWFk ZXIteSArPSB2ZXJzaW9uLmgKLWhlYWRlci15ICs9IHZpZGVvLmgKZGlmZiAtLWdpdCBhL2luY2x1 ZGUvdWFwaS9saW51eC9oZGxjL0tidWlsZCBiL2luY2x1ZGUvdWFwaS9saW51eC9oZGxjL0tidWls ZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggOGMxZDJjYjc1ZTMzLi4wMDAwMDAwMDAw MDAKLS0tIGEvaW5jbHVkZS91YXBpL2xpbnV4L2hkbGMvS2J1aWxkCisrKyAvZGV2L251bGwKQEAg LTEsMiArMCwwIEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBpb2N0 bC5oCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvbGludXgvaHNpL0tidWlsZCBiL2luY2x1ZGUv dWFwaS9saW51eC9oc2kvS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBhMTZh MDA1NDQyNTguLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL3VhcGkvbGludXgvaHNpL0tidWls ZAorKysgL2Rldi9udWxsCkBAIC0xLDIgKzAsMCBAQAotIyBVQVBJIEhlYWRlciBleHBvcnQgbGlz dAotaGVhZGVyLXkgKz0gaHNpX2NoYXIuaCBjcy1wcm90b2NvbC5oCmRpZmYgLS1naXQgYS9pbmNs dWRlL3VhcGkvbGludXgvaWlvL0tidWlsZCBiL2luY2x1ZGUvdWFwaS9saW51eC9paW8vS2J1aWxk CmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA4NmY3NmQ4NGM0NGYuLjAwMDAwMDAwMDAw MAotLS0gYS9pbmNsdWRlL3VhcGkvbGludXgvaWlvL0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0x LDMgKzAsMCBAQAotIyBVQVBJIEhlYWRlciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gZXZlbnRz LmgKLWhlYWRlci15ICs9IHR5cGVzLmgKZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9saW51eC9p c2RuL0tidWlsZCBiL2luY2x1ZGUvdWFwaS9saW51eC9pc2RuL0tidWlsZApkZWxldGVkIGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggODllNTI4NTBiZjI5Li4wMDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVk ZS91YXBpL2xpbnV4L2lzZG4vS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsMiArMCwwIEBACi0j IFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBjYXBpY21kLmgKZGlmZiAtLWdp dCBhL2luY2x1ZGUvdWFwaS9saW51eC9tbWMvS2J1aWxkIGIvaW5jbHVkZS91YXBpL2xpbnV4L21t Yy9LYnVpbGQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDhjMWQyY2I3NWUzMy4uMDAw MDAwMDAwMDAwCi0tLSBhL2luY2x1ZGUvdWFwaS9saW51eC9tbWMvS2J1aWxkCisrKyAvZGV2L251 bGwKQEAgLTEsMiArMCwwIEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSAr PSBpb2N0bC5oCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvbGludXgvbmV0ZmlsdGVyL0tidWls ZCBiL2luY2x1ZGUvdWFwaS9saW51eC9uZXRmaWx0ZXIvS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwM2YxOTRhZWFkYzUuLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL3Vh cGkvbGludXgvbmV0ZmlsdGVyL0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDg5ICswLDAgQEAK LSMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IGlwc2V0LwotaGVhZGVyLXkg Kz0gbmZfY29ubnRyYWNrX2NvbW1vbi5oCi1oZWFkZXIteSArPSBuZl9jb25udHJhY2tfZnRwLmgK LWhlYWRlci15ICs9IG5mX2Nvbm50cmFja19zY3RwLmgKLWhlYWRlci15ICs9IG5mX2Nvbm50cmFj a190Y3AuaAotaGVhZGVyLXkgKz0gbmZfY29ubnRyYWNrX3R1cGxlX2NvbW1vbi5oCi1oZWFkZXIt eSArPSBuZl9sb2cuaAotaGVhZGVyLXkgKz0gbmZfdGFibGVzLmgKLWhlYWRlci15ICs9IG5mX3Rh Ymxlc19jb21wYXQuaAotaGVhZGVyLXkgKz0gbmZfbmF0LmgKLWhlYWRlci15ICs9IG5mbmV0bGlu ay5oCi1oZWFkZXIteSArPSBuZm5ldGxpbmtfYWNjdC5oCi1oZWFkZXIteSArPSBuZm5ldGxpbmtf Y29tcGF0LmgKLWhlYWRlci15ICs9IG5mbmV0bGlua19jb25udHJhY2suaAotaGVhZGVyLXkgKz0g bmZuZXRsaW5rX2N0aGVscGVyLmgKLWhlYWRlci15ICs9IG5mbmV0bGlua19jdHRpbWVvdXQuaAot aGVhZGVyLXkgKz0gbmZuZXRsaW5rX2xvZy5oCi1oZWFkZXIteSArPSBuZm5ldGxpbmtfcXVldWUu aAotaGVhZGVyLXkgKz0geF90YWJsZXMuaAotaGVhZGVyLXkgKz0geHRfQVVESVQuaAotaGVhZGVy LXkgKz0geHRfQ0hFQ0tTVU0uaAotaGVhZGVyLXkgKz0geHRfQ0xBU1NJRlkuaAotaGVhZGVyLXkg Kz0geHRfQ09OTk1BUksuaAotaGVhZGVyLXkgKz0geHRfQ09OTlNFQ01BUksuaAotaGVhZGVyLXkg Kz0geHRfQ1QuaAotaGVhZGVyLXkgKz0geHRfRFNDUC5oCi1oZWFkZXIteSArPSB4dF9ITUFSSy5o Ci1oZWFkZXIteSArPSB4dF9JRExFVElNRVIuaAotaGVhZGVyLXkgKz0geHRfTEVELmgKLWhlYWRl ci15ICs9IHh0X0xPRy5oCi1oZWFkZXIteSArPSB4dF9NQVJLLmgKLWhlYWRlci15ICs9IHh0X05G TE9HLmgKLWhlYWRlci15ICs9IHh0X05GUVVFVUUuaAotaGVhZGVyLXkgKz0geHRfUkFURUVTVC5o Ci1oZWFkZXIteSArPSB4dF9TRUNNQVJLLmgKLWhlYWRlci15ICs9IHh0X1NZTlBST1hZLmgKLWhl YWRlci15ICs9IHh0X1RDUE1TUy5oCi1oZWFkZXIteSArPSB4dF9UQ1BPUFRTVFJJUC5oCi1oZWFk ZXIteSArPSB4dF9URUUuaAotaGVhZGVyLXkgKz0geHRfVFBST1hZLmgKLWhlYWRlci15ICs9IHh0 X2FkZHJ0eXBlLmgKLWhlYWRlci15ICs9IHh0X2JwZi5oCi1oZWFkZXIteSArPSB4dF9jZ3JvdXAu aAotaGVhZGVyLXkgKz0geHRfY2x1c3Rlci5oCi1oZWFkZXIteSArPSB4dF9jb21tZW50LmgKLWhl YWRlci15ICs9IHh0X2Nvbm5ieXRlcy5oCi1oZWFkZXIteSArPSB4dF9jb25ubGFiZWwuaAotaGVh ZGVyLXkgKz0geHRfY29ubmxpbWl0LmgKLWhlYWRlci15ICs9IHh0X2Nvbm5tYXJrLmgKLWhlYWRl ci15ICs9IHh0X2Nvbm50cmFjay5oCi1oZWFkZXIteSArPSB4dF9jcHUuaAotaGVhZGVyLXkgKz0g eHRfZGNjcC5oCi1oZWFkZXIteSArPSB4dF9kZXZncm91cC5oCi1oZWFkZXIteSArPSB4dF9kc2Nw LmgKLWhlYWRlci15ICs9IHh0X2Vjbi5oCi1oZWFkZXIteSArPSB4dF9lc3AuaAotaGVhZGVyLXkg Kz0geHRfaGFzaGxpbWl0LmgKLWhlYWRlci15ICs9IHh0X2hlbHBlci5oCi1oZWFkZXIteSArPSB4 dF9pcGNvbXAuaAotaGVhZGVyLXkgKz0geHRfaXByYW5nZS5oCi1oZWFkZXIteSArPSB4dF9pcHZz LmgKLWhlYWRlci15ICs9IHh0X2wydHAuaAotaGVhZGVyLXkgKz0geHRfbGVuZ3RoLmgKLWhlYWRl ci15ICs9IHh0X2xpbWl0LmgKLWhlYWRlci15ICs9IHh0X21hYy5oCi1oZWFkZXIteSArPSB4dF9t YXJrLmgKLWhlYWRlci15ICs9IHh0X211bHRpcG9ydC5oCi1oZWFkZXIteSArPSB4dF9uZmFjY3Qu aAotaGVhZGVyLXkgKz0geHRfb3NmLmgKLWhlYWRlci15ICs9IHh0X293bmVyLmgKLWhlYWRlci15 ICs9IHh0X3BoeXNkZXYuaAotaGVhZGVyLXkgKz0geHRfcGt0dHlwZS5oCi1oZWFkZXIteSArPSB4 dF9wb2xpY3kuaAotaGVhZGVyLXkgKz0geHRfcXVvdGEuaAotaGVhZGVyLXkgKz0geHRfcmF0ZWVz dC5oCi1oZWFkZXIteSArPSB4dF9yZWFsbS5oCi1oZWFkZXIteSArPSB4dF9yZWNlbnQuaAotaGVh ZGVyLXkgKz0geHRfcnBmaWx0ZXIuaAotaGVhZGVyLXkgKz0geHRfc2N0cC5oCi1oZWFkZXIteSAr PSB4dF9zZXQuaAotaGVhZGVyLXkgKz0geHRfc29ja2V0LmgKLWhlYWRlci15ICs9IHh0X3N0YXRl LmgKLWhlYWRlci15ICs9IHh0X3N0YXRpc3RpYy5oCi1oZWFkZXIteSArPSB4dF9zdHJpbmcuaAot aGVhZGVyLXkgKz0geHRfdGNwbXNzLmgKLWhlYWRlci15ICs9IHh0X3RjcHVkcC5oCi1oZWFkZXIt eSArPSB4dF90aW1lLmgKLWhlYWRlci15ICs9IHh0X3UzMi5oCmRpZmYgLS1naXQgYS9pbmNsdWRl L3VhcGkvbGludXgvbmV0ZmlsdGVyL2lwc2V0L0tidWlsZCBiL2luY2x1ZGUvdWFwaS9saW51eC9u ZXRmaWx0ZXIvaXBzZXQvS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBkMjY4 MDQyM2Q5YWIuLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL3VhcGkvbGludXgvbmV0ZmlsdGVy L2lwc2V0L0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDUgKzAsMCBAQAotIyBVQVBJIEhlYWRl ciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gaXBfc2V0LmgKLWhlYWRlci15ICs9IGlwX3NldF9i aXRtYXAuaAotaGVhZGVyLXkgKz0gaXBfc2V0X2hhc2guaAotaGVhZGVyLXkgKz0gaXBfc2V0X2xp c3QuaApkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2xpbnV4L25ldGZpbHRlcl9hcnAvS2J1aWxk IGIvaW5jbHVkZS91YXBpL2xpbnV4L25ldGZpbHRlcl9hcnAvS2J1aWxkCmRlbGV0ZWQgZmlsZSBt b2RlIDEwMDY0NAppbmRleCA2MmQ1NjM3Y2MwYWMuLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRl L3VhcGkvbGludXgvbmV0ZmlsdGVyX2FycC9LYnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSwzICsw LDAgQEAKLSMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IGFycF90YWJsZXMu aAotaGVhZGVyLXkgKz0gYXJwdF9tYW5nbGUuaApkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2xp bnV4L25ldGZpbHRlcl9icmlkZ2UvS2J1aWxkIGIvaW5jbHVkZS91YXBpL2xpbnV4L25ldGZpbHRl cl9icmlkZ2UvS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwZmJhZDhlZjk2 ZGUuLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL3VhcGkvbGludXgvbmV0ZmlsdGVyX2JyaWRn ZS9LYnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSwxOCArMCwwIEBACi0jIFVBUEkgSGVhZGVyIGV4 cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBlYnRfODAyXzMuaAotaGVhZGVyLXkgKz0gZWJ0X2Ftb25n LmgKLWhlYWRlci15ICs9IGVidF9hcnAuaAotaGVhZGVyLXkgKz0gZWJ0X2FycHJlcGx5LmgKLWhl YWRlci15ICs9IGVidF9pcC5oCi1oZWFkZXIteSArPSBlYnRfaXA2LmgKLWhlYWRlci15ICs9IGVi dF9saW1pdC5oCi1oZWFkZXIteSArPSBlYnRfbG9nLmgKLWhlYWRlci15ICs9IGVidF9tYXJrX20u aAotaGVhZGVyLXkgKz0gZWJ0X21hcmtfdC5oCi1oZWFkZXIteSArPSBlYnRfbmF0LmgKLWhlYWRl ci15ICs9IGVidF9uZmxvZy5oCi1oZWFkZXIteSArPSBlYnRfcGt0dHlwZS5oCi1oZWFkZXIteSAr PSBlYnRfcmVkaXJlY3QuaAotaGVhZGVyLXkgKz0gZWJ0X3N0cC5oCi1oZWFkZXIteSArPSBlYnRf dmxhbi5oCi1oZWFkZXIteSArPSBlYnRhYmxlcy5oCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkv bGludXgvbmV0ZmlsdGVyX2lwdjQvS2J1aWxkIGIvaW5jbHVkZS91YXBpL2xpbnV4L25ldGZpbHRl cl9pcHY0L0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZWNiMjkxZGYzOTBl Li4wMDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS91YXBpL2xpbnV4L25ldGZpbHRlcl9pcHY0L0ti dWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDEwICswLDAgQEAKLSMgVUFQSSBIZWFkZXIgZXhwb3J0 IGxpc3QKLWhlYWRlci15ICs9IGlwX3RhYmxlcy5oCi1oZWFkZXIteSArPSBpcHRfQ0xVU1RFUklQ LmgKLWhlYWRlci15ICs9IGlwdF9FQ04uaAotaGVhZGVyLXkgKz0gaXB0X0xPRy5oCi1oZWFkZXIt eSArPSBpcHRfUkVKRUNULmgKLWhlYWRlci15ICs9IGlwdF9UVEwuaAotaGVhZGVyLXkgKz0gaXB0 X2FoLmgKLWhlYWRlci15ICs9IGlwdF9lY24uaAotaGVhZGVyLXkgKz0gaXB0X3R0bC5oCmRpZmYg LS1naXQgYS9pbmNsdWRlL3VhcGkvbGludXgvbmV0ZmlsdGVyX2lwdjYvS2J1aWxkIGIvaW5jbHVk ZS91YXBpL2xpbnV4L25ldGZpbHRlcl9pcHY2L0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggNzVhNjY4Y2EyMzUzLi4wMDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS91YXBpL2xp bnV4L25ldGZpbHRlcl9pcHY2L0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDEzICswLDAgQEAK LSMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IGlwNl90YWJsZXMuaAotaGVh ZGVyLXkgKz0gaXA2dF9ITC5oCi1oZWFkZXIteSArPSBpcDZ0X0xPRy5oCi1oZWFkZXIteSArPSBp cDZ0X05QVC5oCi1oZWFkZXIteSArPSBpcDZ0X1JFSkVDVC5oCi1oZWFkZXIteSArPSBpcDZ0X2Fo LmgKLWhlYWRlci15ICs9IGlwNnRfZnJhZy5oCi1oZWFkZXIteSArPSBpcDZ0X2hsLmgKLWhlYWRl ci15ICs9IGlwNnRfaXB2NmhlYWRlci5oCi1oZWFkZXIteSArPSBpcDZ0X21oLmgKLWhlYWRlci15 ICs9IGlwNnRfb3B0cy5oCi1oZWFkZXIteSArPSBpcDZ0X3J0LmgKZGlmZiAtLWdpdCBhL2luY2x1 ZGUvdWFwaS9saW51eC9uZnNkL0tidWlsZCBiL2luY2x1ZGUvdWFwaS9saW51eC9uZnNkL0tidWls ZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggYzExYmM0MDQwNTNjLi4wMDAwMDAwMDAw MDAKLS0tIGEvaW5jbHVkZS91YXBpL2xpbnV4L25mc2QvS2J1aWxkCisrKyAvZGV2L251bGwKQEAg LTEsNiArMCwwIEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBjbGQu aAotaGVhZGVyLXkgKz0gZGVidWcuaAotaGVhZGVyLXkgKz0gZXhwb3J0LmgKLWhlYWRlci15ICs9 IG5mc2ZoLmgKLWhlYWRlci15ICs9IHN0YXRzLmgKZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9s aW51eC9yYWlkL0tidWlsZCBiL2luY2x1ZGUvdWFwaS9saW51eC9yYWlkL0tidWlsZApkZWxldGVk IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZTJjM2QyNTQwNWQ3Li4wMDAwMDAwMDAwMDAKLS0tIGEv aW5jbHVkZS91YXBpL2xpbnV4L3JhaWQvS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsMyArMCww IEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBtZF9wLmgKLWhlYWRl ci15ICs9IG1kX3UuaApkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2xpbnV4L3NwaS9LYnVpbGQg Yi9pbmNsdWRlL3VhcGkvbGludXgvc3BpL0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMGNjNzQ3ZWZmMTY1Li4wMDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS91YXBpL2xpbnV4 L3NwaS9LYnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSwyICswLDAgQEAKLSMgVUFQSSBIZWFkZXIg ZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IHNwaWRldi5oCmRpZmYgLS1naXQgYS9pbmNsdWRlL3Vh cGkvbGludXgvc3VucnBjL0tidWlsZCBiL2luY2x1ZGUvdWFwaS9saW51eC9zdW5ycGMvS2J1aWxk CmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA4ZTAyZTQ3YzIwZmIuLjAwMDAwMDAwMDAw MAotLS0gYS9pbmNsdWRlL3VhcGkvbGludXgvc3VucnBjL0tidWlsZAorKysgL2Rldi9udWxsCkBA IC0xLDIgKzAsMCBAQAotIyBVQVBJIEhlYWRlciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gZGVi dWcuaApkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2xpbnV4L3RjX2FjdC9LYnVpbGQgYi9pbmNs dWRlL3VhcGkvbGludXgvdGNfYWN0L0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggZTNkYjc0MDMyOTZmLi4wMDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS91YXBpL2xpbnV4L3Rj X2FjdC9LYnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSwxNSArMCwwIEBACi0jIFVBUEkgSGVhZGVy IGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSB0Y19jc3VtLmgKLWhlYWRlci15ICs9IHRjX2RlZmFj dC5oCi1oZWFkZXIteSArPSB0Y19nYWN0LmgKLWhlYWRlci15ICs9IHRjX2lwdC5oCi1oZWFkZXIt eSArPSB0Y19taXJyZWQuaAotaGVhZGVyLXkgKz0gdGNfbmF0LmgKLWhlYWRlci15ICs9IHRjX3Bl ZGl0LmgKLWhlYWRlci15ICs9IHRjX3NrYmVkaXQuaAotaGVhZGVyLXkgKz0gdGNfdmxhbi5oCi1o ZWFkZXIteSArPSB0Y19icGYuaAotaGVhZGVyLXkgKz0gdGNfY29ubm1hcmsuaAotaGVhZGVyLXkg Kz0gdGNfaWZlLmgKLWhlYWRlci15ICs9IHRjX3R1bm5lbF9rZXkuaAotaGVhZGVyLXkgKz0gdGNf c2tibW9kLmgKZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9saW51eC90Y19lbWF0Y2gvS2J1aWxk IGIvaW5jbHVkZS91YXBpL2xpbnV4L3RjX2VtYXRjaC9LYnVpbGQKZGVsZXRlZCBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDUzZmNhMzkyNTUzNS4uMDAwMDAwMDAwMDAwCi0tLSBhL2luY2x1ZGUvdWFw aS9saW51eC90Y19lbWF0Y2gvS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsNSArMCwwIEBACi0j IFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSB0Y19lbV9jbXAuaAotaGVhZGVy LXkgKz0gdGNfZW1fbWV0YS5oCi1oZWFkZXIteSArPSB0Y19lbV9uYnl0ZS5oCi1oZWFkZXIteSAr PSB0Y19lbV90ZXh0LmgKZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9saW51eC91c2IvS2J1aWxk IGIvaW5jbHVkZS91YXBpL2xpbnV4L3VzYi9LYnVpbGQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDRjYzRkNmU3ZTUyMy4uMDAwMDAwMDAwMDAwCi0tLSBhL2luY2x1ZGUvdWFwaS9saW51 eC91c2IvS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsMTIgKzAsMCBAQAotIyBVQVBJIEhlYWRl ciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gYXVkaW8uaAotaGVhZGVyLXkgKz0gY2RjLmgKLWhl YWRlci15ICs9IGNkYy13ZG0uaAotaGVhZGVyLXkgKz0gY2gxMS5oCi1oZWFkZXIteSArPSBjaDku aAotaGVhZGVyLXkgKz0gZnVuY3Rpb25mcy5oCi1oZWFkZXIteSArPSBnX3ByaW50ZXIuaAotaGVh ZGVyLXkgKz0gZ2FkZ2V0ZnMuaAotaGVhZGVyLXkgKz0gbWlkaS5oCi1oZWFkZXIteSArPSB0bWMu aAotaGVhZGVyLXkgKz0gdmlkZW8uaApkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2xpbnV4L3dp bWF4L0tidWlsZCBiL2luY2x1ZGUvdWFwaS9saW51eC93aW1heC9LYnVpbGQKZGVsZXRlZCBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDFjOTdiZTQ5OTcxZi4uMDAwMDAwMDAwMDAwCi0tLSBhL2luY2x1 ZGUvdWFwaS9saW51eC93aW1heC9LYnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSwyICswLDAgQEAK LSMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IGkyNDAwbS5oCmRpZmYgLS1n aXQgYS9pbmNsdWRlL3VhcGkvbWlzYy9LYnVpbGQgYi9pbmNsdWRlL3VhcGkvbWlzYy9LYnVpbGQK ZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGU5NmNhZTdkNThjOS4uMDAwMDAwMDAwMDAw Ci0tLSBhL2luY2x1ZGUvdWFwaS9taXNjL0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDIgKzAs MCBAQAotIyBtaXNjIEhlYWRlciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gY3hsLmgKZGlmZiAt LWdpdCBhL2luY2x1ZGUvdWFwaS9tdGQvS2J1aWxkIGIvaW5jbHVkZS91YXBpL210ZC9LYnVpbGQK ZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDVhNjkxZTEwY2QwZS4uMDAwMDAwMDAwMDAw Ci0tLSBhL2luY2x1ZGUvdWFwaS9tdGQvS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsNiArMCww IEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBpbmZ0bC11c2VyLmgK LWhlYWRlci15ICs9IG10ZC1hYmkuaAotaGVhZGVyLXkgKz0gbXRkLXVzZXIuaAotaGVhZGVyLXkg Kz0gbmZ0bC11c2VyLmgKLWhlYWRlci15ICs9IHViaS11c2VyLmgKZGlmZiAtLWdpdCBhL2luY2x1 ZGUvdWFwaS9yZG1hL0tidWlsZCBiL2luY2x1ZGUvdWFwaS9yZG1hL0tidWlsZApkZWxldGVkIGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggODJiZGY1NjI2ODU5Li4wMDAwMDAwMDAwMDAKLS0tIGEvaW5j bHVkZS91YXBpL3JkbWEvS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsMTggKzAsMCBAQAotIyBV QVBJIEhlYWRlciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gaWJfdXNlcl9jbS5oCi1oZWFkZXIt eSArPSBpYl91c2VyX21hZC5oCi1oZWFkZXIteSArPSBpYl91c2VyX3NhLmgKLWhlYWRlci15ICs9 IGliX3VzZXJfdmVyYnMuaAotaGVhZGVyLXkgKz0gcmRtYV9uZXRsaW5rLmgKLWhlYWRlci15ICs9 IHJkbWFfdXNlcl9jbS5oCi1oZWFkZXIteSArPSBoZmkvCi1oZWFkZXIteSArPSByZG1hX3VzZXJf cnhlLmgKLWhlYWRlci15ICs9IGN4Z2IzLWFiaS5oCi1oZWFkZXIteSArPSBjeGdiNC1hYmkuaAot aGVhZGVyLXkgKz0gbWx4NC1hYmkuaAotaGVhZGVyLXkgKz0gbWx4NS1hYmkuaAotaGVhZGVyLXkg Kz0gbXRoY2EtYWJpLmgKLWhlYWRlci15ICs9IG5lcy1hYmkuaAotaGVhZGVyLXkgKz0gb2NyZG1h LWFiaS5oCi1oZWFkZXIteSArPSBobnMtYWJpLmgKLWhlYWRlci15ICs9IHZtd19wdnJkbWEtYWJp LmgKZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9yZG1hL2hmaS9LYnVpbGQgYi9pbmNsdWRlL3Vh cGkvcmRtYS9oZmkvS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBlZjIzYzI5 NGZjNzEuLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL3VhcGkvcmRtYS9oZmkvS2J1aWxkCisr KyAvZGV2L251bGwKQEAgLTEsMiArMCwwIEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1o ZWFkZXIteSArPSBoZmkxX3VzZXIuaApkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL3Njc2kvS2J1 aWxkIGIvaW5jbHVkZS91YXBpL3Njc2kvS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NApp bmRleCBkNzkxZTBhZDUwOWQuLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL3VhcGkvc2NzaS9L YnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSw2ICswLDAgQEAKLSMgVUFQSSBIZWFkZXIgZXhwb3J0 IGxpc3QKLWhlYWRlci15ICs9IGZjLwotaGVhZGVyLXkgKz0gc2NzaV9ic2dfZmMuaAotaGVhZGVy LXkgKz0gc2NzaV9uZXRsaW5rLmgKLWhlYWRlci15ICs9IHNjc2lfbmV0bGlua19mYy5oCi1oZWFk ZXIteSArPSBjeGxmbGFzaF9pb2N0bC5oCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvc2NzaS9m Yy9LYnVpbGQgYi9pbmNsdWRlL3VhcGkvc2NzaS9mYy9LYnVpbGQKZGVsZXRlZCBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDVlYWQ5ZmFjMjY1Yy4uMDAwMDAwMDAwMDAwCi0tLSBhL2luY2x1ZGUvdWFw aS9zY3NpL2ZjL0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDUgKzAsMCBAQAotIyBVQVBJIEhl YWRlciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gZmNfZWxzLmgKLWhlYWRlci15ICs9IGZjX2Zz LmgKLWhlYWRlci15ICs9IGZjX2dzLmgKLWhlYWRlci15ICs9IGZjX25zLmgKZGlmZiAtLWdpdCBh L2luY2x1ZGUvdWFwaS9zb3VuZC9LYnVpbGQgYi9pbmNsdWRlL3VhcGkvc291bmQvS2J1aWxkCmRl bGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA5NTc4ZDhiZGJmMzEuLjAwMDAwMDAwMDAwMAot LS0gYS9pbmNsdWRlL3VhcGkvc291bmQvS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsMTYgKzAs MCBAQAotIyBVQVBJIEhlYWRlciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gYXNlcXVlbmNlci5o Ci1oZWFkZXIteSArPSBhc29jLmgKLWhlYWRlci15ICs9IGFzb3VuZC5oCi1oZWFkZXIteSArPSBh c291bmRfZm0uaAotaGVhZGVyLXkgKz0gY29tcHJlc3Nfb2ZmbG9hZC5oCi1oZWFkZXIteSArPSBj b21wcmVzc19wYXJhbXMuaAotaGVhZGVyLXkgKz0gZW11MTBrMS5oCi1oZWFkZXIteSArPSBmaXJl d2lyZS5oCi1oZWFkZXIteSArPSBoZHNwLmgKLWhlYWRlci15ICs9IGhkc3BtLmgKLWhlYWRlci15 ICs9IHNiMTZfY3NwLmgKLWhlYWRlci15ICs9IHNmbnRfaW5mby5oCi1oZWFkZXIteSArPSB0bHYu aAotaGVhZGVyLXkgKz0gdXNiX3N0cmVhbS5oCi1oZWFkZXIteSArPSBzbmRfc3N0X3Rva2Vucy5o CmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvdmlkZW8vS2J1aWxkIGIvaW5jbHVkZS91YXBpL3Zp ZGVvL0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggYWM3MjAzYmIzMmNjLi4w MDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS91YXBpL3ZpZGVvL0tidWlsZAorKysgL2Rldi9udWxs CkBAIC0xLDQgKzAsMCBAQAotIyBVQVBJIEhlYWRlciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0g ZWRpZC5oCi1oZWFkZXIteSArPSBzaXNmYi5oCi1oZWFkZXIteSArPSB1dmVzYWZiLmgKZGlmZiAt LWdpdCBhL2luY2x1ZGUvdWFwaS94ZW4vS2J1aWxkIGIvaW5jbHVkZS91YXBpL3hlbi9LYnVpbGQK ZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDVjNDU5NjI4ZThjNy4uMDAwMDAwMDAwMDAw Ci0tLSBhL2luY2x1ZGUvdWFwaS94ZW4vS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsNSArMCww IEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBldnRjaG4uaAotaGVh ZGVyLXkgKz0gZ250YWxsb2MuaAotaGVhZGVyLXkgKz0gZ250ZGV2LmgKLWhlYWRlci15ICs9IHBy aXZjbWQuaApkaWZmIC0tZ2l0IGEvaW5jbHVkZS92aWRlby9LYnVpbGQgYi9pbmNsdWRlL3ZpZGVv L0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZTY5ZGUyOWJiMmQxLi4wMDAw MDAwMDAwMDAKZGlmZiAtLWdpdCBhL3NjcmlwdHMvTWFrZWZpbGUuaGVhZGVyc2luc3QgYi9zY3Jp cHRzL01ha2VmaWxlLmhlYWRlcnNpbnN0CmluZGV4IDg3NmI0MmNmZWRlNC4uYmI5M2Y4NDY2YTM1 IDEwMDY0NAotLS0gYS9zY3JpcHRzL01ha2VmaWxlLmhlYWRlcnNpbnN0CisrKyBiL3NjcmlwdHMv TWFrZWZpbGUuaGVhZGVyc2luc3QKQEAgLTEsMTcgKzEsMTggQEAKICMgPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KICMgSW5zdGFsbGluZyBoZWFkZXJzCiAjCi0jIGhlYWRlci15ICAtIGxpc3QgZmlsZXMgdG8g YmUgaW5zdGFsbGVkLiBUaGV5IGFyZSBwcmVwcm9jZXNzZWQKLSMgICAgICAgICAgICAgdG8gcmVt b3ZlIF9fS0VSTkVMX18gc2VjdGlvbiBvZiB0aGUgZmlsZQotIyBnZW5oZHIteSAgLSBTYW1lIGFz IGhlYWRlci15IGJ1dCBpbiBhIGdlbmVyYXRlZC8gZGlyZWN0b3J5CisjIEFsbCBoZWFkZXJzIHVu ZGVyIGluY2x1ZGUvdWFwaSwgaW5jbHVkZS9nZW5lcmF0ZWQvdWFwaSwKKyMgYXJjaC88YXJjaD4v aW5jbHVkZS91YXBpL2FzbSBhbmQgL2luY2x1ZGUvZ2VuZXJhdGVkL3VhcGkvYXNtIGFyZSBleHBv cnRlZC4KKyMgVGhleSBhcmUgcHJlcHJvY2Vzc2VkIHRvIHJlbW92ZSBfX0tFUk5FTF9fIHNlY3Rp b24gb2YgdGhlIGZpbGUuCiAjCiAjID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CiAKICMgZ2VuZXJhdGVkIGhl YWRlciBkaXJlY3RvcnkKIGdlbiA6PSAkKGlmICQoZ2VuKSwkKGdlbiksJChzdWJzdCBpbmNsdWRl LyxpbmNsdWRlL2dlbmVyYXRlZC8sJChvYmopKSkKIAorIyBLYnVpbGQgZmlsZSBpcyBvcHRpb25h bAoga2J1aWxkLWZpbGUgOj0gJChzcmN0cmVlKS8kKG9iaikvS2J1aWxkCi1pbmNsdWRlICQoa2J1 aWxkLWZpbGUpCistaW5jbHVkZSAkKGtidWlsZC1maWxlKQogCiAjIGNhbGxlZCBtYXkgc2V0IGRl c3RpbmF0aW9uIGRpciAod2hlbiBpbnN0YWxsaW5nIHRvIGFzbS8pCiBfZHN0IDo9ICQoaWYgJChk c3QpLCQoZHN0KSwkKG9iaikpCkBAIC0yNSw5ICsyNiwxMiBAQCBpbmNsdWRlIHNjcmlwdHMvS2J1 aWxkLmluY2x1ZGUKIAogaW5zdGFsbGRpciAgICA6PSAkKElOU1RBTExfSERSX1BBVEgpLyQoc3Vi c3QgdWFwaS8sLCQoX2RzdCkpCiAKLWhlYWRlci15ICAgICAgOj0gJChzb3J0ICQoaGVhZGVyLXkp KQotc3ViZGlycyAgICAgICA6PSAkKHBhdHN1YnN0ICUvLCUsJChmaWx0ZXIgJS8sICQoaGVhZGVy LXkpKSkKLWhlYWRlci15ICAgICAgOj0gJChmaWx0ZXItb3V0ICUvLCAkKGhlYWRlci15KSkKK3N1 YmRpcnMgICAgICAgOj0gJChwYXRzdWJzdCAkKHNyY3RyZWUpLyQob2JqKS8lLy4sJSwkKHdpbGRj YXJkICQoc3JjdHJlZSkvJChvYmopLyovLikpCitzdWJkaXJzICAgICAgICs9ICQoc3ViZGlyLXkp CitoZWFkZXItZmlsZXMgIDo9ICQobm90ZGlyICQod2lsZGNhcmQgJChzcmN0cmVlKS8kKG9iaikv Ki5oKSkKK2hlYWRlci1maWxlcyAgKz0gJChub3RkaXIgJCh3aWxkY2FyZCAkKHNyY3RyZWUpLyQo b2JqKS8qLmFnaCkpCitnZW5oZHItZmlsZXMgIDo9ICQobm90ZGlyICQod2lsZGNhcmQgJChzcmN0 cmVlKS8kKGdlbikvKi5oKSkKK2dlbmhkci1maWxlcyAgOj0gJChmaWx0ZXItb3V0ICQoaGVhZGVy LWZpbGVzKSwgJChnZW5oZHItZmlsZXMpKQogCiAjIGZpbGVzIHVzZWQgdG8gdHJhY2sgc3RhdGUg b2YgaW5zdGFsbC9jaGVjawogaW5zdGFsbC1maWxlICA6PSAkKGluc3RhbGxkaXIpLy5pbnN0YWxs CkBAIC0zNSwyNiArMzksMTcgQEAgY2hlY2stZmlsZSAgICA6PSAkKGluc3RhbGxkaXIpLy5jaGVj awogCiAjIGdlbmVyaWMteSBsaXN0IGFsbCBmaWxlcyBhbiBhcmNoaXRlY3R1cmUgdXNlcyBmcm9t IGFzbS1nZW5lcmljCiAjIFVzZSB0aGlzIHRvIGJ1aWxkIGEgbGlzdCBvZiBoZWFkZXJzIHdoaWNo IHJlcXVpcmUgYSB3cmFwcGVyCi13cmFwcGVyLWZpbGVzIDo9ICQoZmlsdGVyICQoaGVhZGVyLXkp LCAkKGdlbmVyaWMteSkpCitnZW5lcmljLWZpbGVzIDo9ICQobm90ZGlyICQod2lsZGNhcmQgJChz cmN0cmVlKS9pbmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMvKi5oKSkKK3dyYXBwZXItZmlsZXMgOj0g JChmaWx0ZXIgJChnZW5lcmljLWZpbGVzKSwgJChnZW5lcmljLXkpKQord3JhcHBlci1maWxlcyA6 PSAkKGZpbHRlci1vdXQgJChoZWFkZXItZmlsZXMpLCAkKHdyYXBwZXItZmlsZXMpKQogCiBzcmNk aXIgICAgICAgIDo9ICQoc3JjdHJlZSkvJChvYmopCiBnZW5kaXIgICAgICAgIDo9ICQob2JqdHJl ZSkvJChnZW4pCiAKICMgYWxsIGhlYWRlcnMgZmlsZXMgZm9yIHRoaXMgZGlyCi1oZWFkZXIteSAg ICAgIDo9ICQoZmlsdGVyLW91dCAkKGdlbmVyaWMteSksICQoaGVhZGVyLXkpKQotYWxsLWZpbGVz ICAgICA6PSAkKGhlYWRlci15KSAkKGdlbmhkci15KSAkKHdyYXBwZXItZmlsZXMpCithbGwtZmls ZXMgICAgIDo9ICQoaGVhZGVyLWZpbGVzKSAkKGdlbmhkci1maWxlcykgJCh3cmFwcGVyLWZpbGVz KQogb3V0cHV0LWZpbGVzICA6PSAkKGFkZHByZWZpeCAkKGluc3RhbGxkaXIpLywgJChhbGwtZmls ZXMpKQogCi0jIENoZWNrIHRoYXQgYWxsIGV4cGVjdGVkIGZpbGVzIGV4aXN0Ci0kKGZvcmVhY2gg aGRyLCAkKGhlYWRlci15KSwgXAotICAkKGlmICQod2lsZGNhcmQgJChzcmNkaXIpLyQoaGRyKSks LCBcCi0gICAgICAgJChlcnJvciBNaXNzaW5nIFVBUEkgZmlsZSAkKHNyY2RpcikvJChoZHIpKSBc Ci0gICApKQotJChmb3JlYWNoIGhkciwgJChnZW5oZHIteSksIFwKLSAgJChpZgkkKHdpbGRjYXJk ICQoZ2VuZGlyKS8kKGhkcikpLCwgXAotICAgICAgICQoZXJyb3IgTWlzc2luZyBnZW5lcmF0ZWQg VUFQSSBmaWxlICQoZ2VuZGlyKS8kKGhkcikpIFwKLSAgKSkKLQogIyBXb3JrIG91dCB3aGF0IG5l ZWRzIHRvIGJlIHJlbW92ZWQKIG9sZGhlYWRlcnMgICAgOj0gJChwYXRzdWJzdCAkKGluc3RhbGxk aXIpLyUsJSwkKHdpbGRjYXJkICQoaW5zdGFsbGRpcikvKi5oKSkKIHVud2FudGVkICAgICAgOj0g JChmaWx0ZXItb3V0ICQoYWxsLWZpbGVzKSwkKG9sZGhlYWRlcnMpKQpAQCAtNjcsOCArNjIsOCBA QCBwcmludGRpciA9ICQocGF0c3Vic3QgJChJTlNUQUxMX0hEUl9QQVRIKS8lLywlLCQoZGlyICRA KSkKIHF1aWV0X2NtZF9pbnN0YWxsID0gSU5TVEFMTCAkKHByaW50ZGlyKSAoJCh3b3JkcyAkKGFs bC1maWxlcykpXAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZpbGUkKGlmICQod29yZCAy LCAkKGFsbC1maWxlcykpLHMpKQogICAgICAgY21kX2luc3RhbGwgPSBcCi0gICAgICAgICQoQ09O RklHX1NIRUxMKSAkPCAkKGluc3RhbGxkaXIpICQoc3JjZGlyKSAkKGhlYWRlci15KTsgXAotICAg ICAgICAkKENPTkZJR19TSEVMTCkgJDwgJChpbnN0YWxsZGlyKSAkKGdlbmRpcikgJChnZW5oZHIt eSk7IFwKKyAgICAgICAgJChDT05GSUdfU0hFTEwpICQ8ICQoaW5zdGFsbGRpcikgJChzcmNkaXIp ICQoaGVhZGVyLWZpbGVzKTsgXAorICAgICAgICAkKENPTkZJR19TSEVMTCkgJDwgJChpbnN0YWxs ZGlyKSAkKGdlbmRpcikgJChnZW5oZHItZmlsZXMpOyBcCiAgICAgICAgIGZvciBGIGluICQod3Jh cHBlci1maWxlcyk7IGRvICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAg ICAgICAgICAgICAgZWNobyAiXCNpbmNsdWRlIDxhc20tZ2VuZXJpYy8kJEY+IiA+ICQoaW5zdGFs bGRpcikvJCRGOyAgICBcCiAgICAgICAgIGRvbmU7ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0tIAoyLjguMQoKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxp c3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZl bAo= ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-06 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 41 ++- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 4 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 59 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 482 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 39 +-- 81 files changed, 73 insertions(+), 1745 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..53e31061ff18 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 subdir-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1262,36 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. + +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. See subsequent chapter for the syntax of the Kbuild file. - --- 7.1 header-y + --- 7.1 subdir-y - header-y specifies header files to be exported. + subdir-y may be used to specify a subdirectory to be exported. Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..766455d0d291 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,5 +1,3 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += elf.h - generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y += - - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr-index.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..c13805d5a2a0 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +generic-y += auxvec.h +generic-y += bitsperlong.h +generic-y += byteorder.h +generic-y += errno.h +generic-y += fcntl.h +generic-y += ioctl.h +generic-y += ioctls.h +generic-y += ipcbuf.h +generic-y += mman.h +generic-y += msgbuf.h +generic-y += param.h +generic-y += poll.h +generic-y += posix_types.h +generic-y += ptrace.h +generic-y += resource.h +generic-y += sembuf.h +generic-y += setup.h +generic-y += shmbuf.h +generic-y += sigcontext.h +generic-y += siginfo.h +generic-y += signal.h +generic-y += socket.h +generic-y += sockios.h +generic-y += stat.h +generic-y += statfs.h +generic-y += swab.h +generic-y += termbits.h +generic-y += termios.h +generic-y += types.h +generic-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +generic-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index a8b93e685239..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,482 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..bb93f8466a35 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,18 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +26,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,26 +39,17 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) - # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) unwanted := $(filter-out $(all-files),$(oldheaders)) @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-06 9:43 ` Nicolas Dichtel ` (8 preceding siblings ...) (?) @ 2017-01-09 10:01 ` Daniel Vetter -1 siblings, 0 replies; 554+ messages in thread From: Daniel Vetter @ 2017-01-09 10:01 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Makes lots of sense. Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > Documentation/kbuild/makefiles.txt | 41 ++- > arch/alpha/include/uapi/asm/Kbuild | 41 --- > arch/arc/include/uapi/asm/Kbuild | 3 - > arch/arm/include/uapi/asm/Kbuild | 17 - > arch/arm64/include/uapi/asm/Kbuild | 18 -- > arch/avr32/include/uapi/asm/Kbuild | 20 -- > arch/blackfin/include/uapi/asm/Kbuild | 17 - > arch/c6x/include/uapi/asm/Kbuild | 8 - > arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - > arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - > arch/cris/include/uapi/asm/Kbuild | 43 +-- > arch/frv/include/uapi/asm/Kbuild | 33 -- > arch/h8300/include/uapi/asm/Kbuild | 28 -- > arch/hexagon/include/asm/Kbuild | 3 - > arch/hexagon/include/uapi/asm/Kbuild | 13 - > arch/ia64/include/uapi/asm/Kbuild | 45 --- > arch/m32r/include/uapi/asm/Kbuild | 31 -- > arch/m68k/include/uapi/asm/Kbuild | 24 -- > arch/metag/include/uapi/asm/Kbuild | 8 - > arch/microblaze/include/uapi/asm/Kbuild | 32 -- > arch/mips/include/uapi/asm/Kbuild | 37 --- > arch/mn10300/include/uapi/asm/Kbuild | 32 -- > arch/nios2/include/uapi/asm/Kbuild | 4 +- > arch/openrisc/include/asm/Kbuild | 3 - > arch/openrisc/include/uapi/asm/Kbuild | 8 - > arch/parisc/include/uapi/asm/Kbuild | 28 -- > arch/powerpc/include/uapi/asm/Kbuild | 45 --- > arch/s390/include/uapi/asm/Kbuild | 52 --- > arch/score/include/asm/Kbuild | 4 - > arch/score/include/uapi/asm/Kbuild | 32 -- > arch/sh/include/uapi/asm/Kbuild | 23 -- > arch/sparc/include/uapi/asm/Kbuild | 48 --- > arch/tile/include/asm/Kbuild | 3 - > arch/tile/include/uapi/arch/Kbuild | 17 - > arch/tile/include/uapi/asm/Kbuild | 19 +- > arch/unicore32/include/uapi/asm/Kbuild | 6 - > arch/x86/include/uapi/asm/Kbuild | 59 ---- > arch/xtensa/include/uapi/asm/Kbuild | 23 -- > include/Kbuild | 2 - > include/asm-generic/Kbuild.asm | 1 - > include/scsi/fc/Kbuild | 0 > include/uapi/Kbuild | 15 - > include/uapi/asm-generic/Kbuild | 36 --- > include/uapi/asm-generic/Kbuild.asm | 62 ++-- > include/uapi/drm/Kbuild | 22 -- > include/uapi/linux/Kbuild | 482 ---------------------------- > include/uapi/linux/android/Kbuild | 2 - > include/uapi/linux/byteorder/Kbuild | 3 - > include/uapi/linux/caif/Kbuild | 3 - > include/uapi/linux/can/Kbuild | 6 - > include/uapi/linux/dvb/Kbuild | 9 - > include/uapi/linux/hdlc/Kbuild | 2 - > include/uapi/linux/hsi/Kbuild | 2 - > include/uapi/linux/iio/Kbuild | 3 - > include/uapi/linux/isdn/Kbuild | 2 - > include/uapi/linux/mmc/Kbuild | 2 - > include/uapi/linux/netfilter/Kbuild | 89 ----- > include/uapi/linux/netfilter/ipset/Kbuild | 5 - > include/uapi/linux/netfilter_arp/Kbuild | 3 - > include/uapi/linux/netfilter_bridge/Kbuild | 18 -- > include/uapi/linux/netfilter_ipv4/Kbuild | 10 - > include/uapi/linux/netfilter_ipv6/Kbuild | 13 - > include/uapi/linux/nfsd/Kbuild | 6 - > include/uapi/linux/raid/Kbuild | 3 - > include/uapi/linux/spi/Kbuild | 2 - > include/uapi/linux/sunrpc/Kbuild | 2 - > include/uapi/linux/tc_act/Kbuild | 15 - > include/uapi/linux/tc_ematch/Kbuild | 5 - > include/uapi/linux/usb/Kbuild | 12 - > include/uapi/linux/wimax/Kbuild | 2 - > include/uapi/misc/Kbuild | 2 - > include/uapi/mtd/Kbuild | 6 - > include/uapi/rdma/Kbuild | 18 -- > include/uapi/rdma/hfi/Kbuild | 2 - > include/uapi/scsi/Kbuild | 6 - > include/uapi/scsi/fc/Kbuild | 5 - > include/uapi/sound/Kbuild | 16 - > include/uapi/video/Kbuild | 4 - > include/uapi/xen/Kbuild | 5 - > include/video/Kbuild | 0 > scripts/Makefile.headersinst | 39 +-- > 81 files changed, 73 insertions(+), 1745 deletions(-) > delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > delete mode 100644 arch/tile/include/uapi/arch/Kbuild > delete mode 100644 include/Kbuild > delete mode 100644 include/asm-generic/Kbuild.asm > delete mode 100644 include/scsi/fc/Kbuild > delete mode 100644 include/uapi/Kbuild > delete mode 100644 include/uapi/asm-generic/Kbuild > delete mode 100644 include/uapi/drm/Kbuild > delete mode 100644 include/uapi/linux/Kbuild > delete mode 100644 include/uapi/linux/android/Kbuild > delete mode 100644 include/uapi/linux/byteorder/Kbuild > delete mode 100644 include/uapi/linux/caif/Kbuild > delete mode 100644 include/uapi/linux/can/Kbuild > delete mode 100644 include/uapi/linux/dvb/Kbuild > delete mode 100644 include/uapi/linux/hdlc/Kbuild > delete mode 100644 include/uapi/linux/hsi/Kbuild > delete mode 100644 include/uapi/linux/iio/Kbuild > delete mode 100644 include/uapi/linux/isdn/Kbuild > delete mode 100644 include/uapi/linux/mmc/Kbuild > delete mode 100644 include/uapi/linux/netfilter/Kbuild > delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > delete mode 100644 include/uapi/linux/nfsd/Kbuild > delete mode 100644 include/uapi/linux/raid/Kbuild > delete mode 100644 include/uapi/linux/spi/Kbuild > delete mode 100644 include/uapi/linux/sunrpc/Kbuild > delete mode 100644 include/uapi/linux/tc_act/Kbuild > delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > delete mode 100644 include/uapi/linux/usb/Kbuild > delete mode 100644 include/uapi/linux/wimax/Kbuild > delete mode 100644 include/uapi/misc/Kbuild > delete mode 100644 include/uapi/mtd/Kbuild > delete mode 100644 include/uapi/rdma/Kbuild > delete mode 100644 include/uapi/rdma/hfi/Kbuild > delete mode 100644 include/uapi/scsi/Kbuild > delete mode 100644 include/uapi/scsi/fc/Kbuild > delete mode 100644 include/uapi/sound/Kbuild > delete mode 100644 include/uapi/video/Kbuild > delete mode 100644 include/uapi/xen/Kbuild > delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > --- 6.11 Post-link pass > > === 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > --- 7.2 genhdr-y > --- 7.3 generic-y > --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > that may be shared between individual architectures. > The recommended approach how to use a generic header file is > to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > > --- 6.11 Post-link pass > > @@ -1262,37 +1262,36 @@ The pre-processing does: > - drop include of compiler.h > - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > See subsequent chapter for the syntax of the Kbuild file. > > - --- 7.1 header-y > + --- 7.1 subdir-y > > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > > Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > > - The convention is to list one file per line and > + The convention is to list one subdir per line and > preferably in alphabetic order. > > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > --- 7.2 genhdr-y > > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > > Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > > --- 7.3 generic-y > > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > generic-y += bitsperlong.h > generic-y += errno.h > generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += auxvec.h > generic-y += barrier.h > generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > generic-y += sockios.h > generic-y += termbits.h > generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > generic-y += mman.h > generic-y += resource.h > generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += atomic.h > generic-y += auxvec.h > generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y += > - > - > generic-y += barrier.h > generic-y += clkdev.h > generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > # UAPI Header export list > -# User exported sparc header files > - > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > generic-y += bug.h > generic-y += bugs.h > generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > genhdr-y += unistd_32.h > genhdr-y += unistd_64.h > genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > $(if \ > $(wildcard \ > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > # ========================================================================== > # Installing headers > # > -# header-y - list files to be installed. They are preprocessed > -# to remove __KERNEL__ section of the file > -# genhdr-y - Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > # > # ========================================================================== > > # generated header directory > gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > > +# Kbuild file is optional > kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > > # called may set destination dir (when installing to asm/) > _dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > > installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > > -header-y := $(sort $(header-y)) > -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y := $(filter-out %/, $(header-y)) > +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs += $(subdir-y) > +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) > > # files used to track state of install/check > install-file := $(installdir)/.install > @@ -35,26 +39,17 @@ check-file := $(installdir)/.check > > # generic-y list all files an architecture uses from asm-generic > # Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > > srcdir := $(srctree)/$(obj) > gendir := $(objtree)/$(gen) > > # all headers files for this dir > -header-y := $(filter-out $(generic-y), $(header-y)) > -all-files := $(header-y) $(genhdr-y) $(wrapper-files) > +all-files := $(header-files) $(genhdr-files) $(wrapper-files) > output-files := $(addprefix $(installdir)/, $(all-files)) > > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > - $(if $(wildcard $(srcdir)/$(hdr)),, \ > - $(error Missing UAPI file $(srcdir)/$(hdr)) \ > - )) > -$(foreach hdr, $(genhdr-y), \ > - $(if $(wildcard $(gendir)/$(hdr)),, \ > - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ > - )) > - > # Work out what needs to be removed > oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > unwanted := $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > file$(if $(word 2, $(all-files)),s)) > cmd_install = \ > - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > for F in $(wrapper-files); do \ > echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ > done; \ > -- > 2.8.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-doc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-06 9:43 ` Nicolas Dichtel ` (9 preceding siblings ...) (?) @ 2017-01-09 10:01 ` Daniel Vetter -1 siblings, 0 replies; 554+ messages in thread From: Daniel Vetter @ 2017-01-09 10:01 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Makes lots of sense. Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > Documentation/kbuild/makefiles.txt | 41 ++- > arch/alpha/include/uapi/asm/Kbuild | 41 --- > arch/arc/include/uapi/asm/Kbuild | 3 - > arch/arm/include/uapi/asm/Kbuild | 17 - > arch/arm64/include/uapi/asm/Kbuild | 18 -- > arch/avr32/include/uapi/asm/Kbuild | 20 -- > arch/blackfin/include/uapi/asm/Kbuild | 17 - > arch/c6x/include/uapi/asm/Kbuild | 8 - > arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - > arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - > arch/cris/include/uapi/asm/Kbuild | 43 +-- > arch/frv/include/uapi/asm/Kbuild | 33 -- > arch/h8300/include/uapi/asm/Kbuild | 28 -- > arch/hexagon/include/asm/Kbuild | 3 - > arch/hexagon/include/uapi/asm/Kbuild | 13 - > arch/ia64/include/uapi/asm/Kbuild | 45 --- > arch/m32r/include/uapi/asm/Kbuild | 31 -- > arch/m68k/include/uapi/asm/Kbuild | 24 -- > arch/metag/include/uapi/asm/Kbuild | 8 - > arch/microblaze/include/uapi/asm/Kbuild | 32 -- > arch/mips/include/uapi/asm/Kbuild | 37 --- > arch/mn10300/include/uapi/asm/Kbuild | 32 -- > arch/nios2/include/uapi/asm/Kbuild | 4 +- > arch/openrisc/include/asm/Kbuild | 3 - > arch/openrisc/include/uapi/asm/Kbuild | 8 - > arch/parisc/include/uapi/asm/Kbuild | 28 -- > arch/powerpc/include/uapi/asm/Kbuild | 45 --- > arch/s390/include/uapi/asm/Kbuild | 52 --- > arch/score/include/asm/Kbuild | 4 - > arch/score/include/uapi/asm/Kbuild | 32 -- > arch/sh/include/uapi/asm/Kbuild | 23 -- > arch/sparc/include/uapi/asm/Kbuild | 48 --- > arch/tile/include/asm/Kbuild | 3 - > arch/tile/include/uapi/arch/Kbuild | 17 - > arch/tile/include/uapi/asm/Kbuild | 19 +- > arch/unicore32/include/uapi/asm/Kbuild | 6 - > arch/x86/include/uapi/asm/Kbuild | 59 ---- > arch/xtensa/include/uapi/asm/Kbuild | 23 -- > include/Kbuild | 2 - > include/asm-generic/Kbuild.asm | 1 - > include/scsi/fc/Kbuild | 0 > include/uapi/Kbuild | 15 - > include/uapi/asm-generic/Kbuild | 36 --- > include/uapi/asm-generic/Kbuild.asm | 62 ++-- > include/uapi/drm/Kbuild | 22 -- > include/uapi/linux/Kbuild | 482 ---------------------------- > include/uapi/linux/android/Kbuild | 2 - > include/uapi/linux/byteorder/Kbuild | 3 - > include/uapi/linux/caif/Kbuild | 3 - > include/uapi/linux/can/Kbuild | 6 - > include/uapi/linux/dvb/Kbuild | 9 - > include/uapi/linux/hdlc/Kbuild | 2 - > include/uapi/linux/hsi/Kbuild | 2 - > include/uapi/linux/iio/Kbuild | 3 - > include/uapi/linux/isdn/Kbuild | 2 - > include/uapi/linux/mmc/Kbuild | 2 - > include/uapi/linux/netfilter/Kbuild | 89 ----- > include/uapi/linux/netfilter/ipset/Kbuild | 5 - > include/uapi/linux/netfilter_arp/Kbuild | 3 - > include/uapi/linux/netfilter_bridge/Kbuild | 18 -- > include/uapi/linux/netfilter_ipv4/Kbuild | 10 - > include/uapi/linux/netfilter_ipv6/Kbuild | 13 - > include/uapi/linux/nfsd/Kbuild | 6 - > include/uapi/linux/raid/Kbuild | 3 - > include/uapi/linux/spi/Kbuild | 2 - > include/uapi/linux/sunrpc/Kbuild | 2 - > include/uapi/linux/tc_act/Kbuild | 15 - > include/uapi/linux/tc_ematch/Kbuild | 5 - > include/uapi/linux/usb/Kbuild | 12 - > include/uapi/linux/wimax/Kbuild | 2 - > include/uapi/misc/Kbuild | 2 - > include/uapi/mtd/Kbuild | 6 - > include/uapi/rdma/Kbuild | 18 -- > include/uapi/rdma/hfi/Kbuild | 2 - > include/uapi/scsi/Kbuild | 6 - > include/uapi/scsi/fc/Kbuild | 5 - > include/uapi/sound/Kbuild | 16 - > include/uapi/video/Kbuild | 4 - > include/uapi/xen/Kbuild | 5 - > include/video/Kbuild | 0 > scripts/Makefile.headersinst | 39 +-- > 81 files changed, 73 insertions(+), 1745 deletions(-) > delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > delete mode 100644 arch/tile/include/uapi/arch/Kbuild > delete mode 100644 include/Kbuild > delete mode 100644 include/asm-generic/Kbuild.asm > delete mode 100644 include/scsi/fc/Kbuild > delete mode 100644 include/uapi/Kbuild > delete mode 100644 include/uapi/asm-generic/Kbuild > delete mode 100644 include/uapi/drm/Kbuild > delete mode 100644 include/uapi/linux/Kbuild > delete mode 100644 include/uapi/linux/android/Kbuild > delete mode 100644 include/uapi/linux/byteorder/Kbuild > delete mode 100644 include/uapi/linux/caif/Kbuild > delete mode 100644 include/uapi/linux/can/Kbuild > delete mode 100644 include/uapi/linux/dvb/Kbuild > delete mode 100644 include/uapi/linux/hdlc/Kbuild > delete mode 100644 include/uapi/linux/hsi/Kbuild > delete mode 100644 include/uapi/linux/iio/Kbuild > delete mode 100644 include/uapi/linux/isdn/Kbuild > delete mode 100644 include/uapi/linux/mmc/Kbuild > delete mode 100644 include/uapi/linux/netfilter/Kbuild > delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > delete mode 100644 include/uapi/linux/nfsd/Kbuild > delete mode 100644 include/uapi/linux/raid/Kbuild > delete mode 100644 include/uapi/linux/spi/Kbuild > delete mode 100644 include/uapi/linux/sunrpc/Kbuild > delete mode 100644 include/uapi/linux/tc_act/Kbuild > delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > delete mode 100644 include/uapi/linux/usb/Kbuild > delete mode 100644 include/uapi/linux/wimax/Kbuild > delete mode 100644 include/uapi/misc/Kbuild > delete mode 100644 include/uapi/mtd/Kbuild > delete mode 100644 include/uapi/rdma/Kbuild > delete mode 100644 include/uapi/rdma/hfi/Kbuild > delete mode 100644 include/uapi/scsi/Kbuild > delete mode 100644 include/uapi/scsi/fc/Kbuild > delete mode 100644 include/uapi/sound/Kbuild > delete mode 100644 include/uapi/video/Kbuild > delete mode 100644 include/uapi/xen/Kbuild > delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > --- 6.11 Post-link pass > > === 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > --- 7.2 genhdr-y > --- 7.3 generic-y > --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > that may be shared between individual architectures. > The recommended approach how to use a generic header file is > to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > > --- 6.11 Post-link pass > > @@ -1262,37 +1262,36 @@ The pre-processing does: > - drop include of compiler.h > - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > See subsequent chapter for the syntax of the Kbuild file. > > - --- 7.1 header-y > + --- 7.1 subdir-y > > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > > Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > > - The convention is to list one file per line and > + The convention is to list one subdir per line and > preferably in alphabetic order. > > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > --- 7.2 genhdr-y > > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > > Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > > --- 7.3 generic-y > > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > generic-y += bitsperlong.h > generic-y += errno.h > generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += auxvec.h > generic-y += barrier.h > generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > generic-y += sockios.h > generic-y += termbits.h > generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > generic-y += mman.h > generic-y += resource.h > generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += atomic.h > generic-y += auxvec.h > generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y += > - > - > generic-y += barrier.h > generic-y += clkdev.h > generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > # UAPI Header export list > -# User exported sparc header files > - > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > generic-y += bug.h > generic-y += bugs.h > generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > genhdr-y += unistd_32.h > genhdr-y += unistd_64.h > genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > $(if \ > $(wildcard \ > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > # ========================================================================== > # Installing headers > # > -# header-y - list files to be installed. They are preprocessed > -# to remove __KERNEL__ section of the file > -# genhdr-y - Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > # > # ========================================================================== > > # generated header directory > gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > > +# Kbuild file is optional > kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > > # called may set destination dir (when installing to asm/) > _dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > > installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > > -header-y := $(sort $(header-y)) > -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y := $(filter-out %/, $(header-y)) > +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs += $(subdir-y) > +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) > > # files used to track state of install/check > install-file := $(installdir)/.install > @@ -35,26 +39,17 @@ check-file := $(installdir)/.check > > # generic-y list all files an architecture uses from asm-generic > # Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > > srcdir := $(srctree)/$(obj) > gendir := $(objtree)/$(gen) > > # all headers files for this dir > -header-y := $(filter-out $(generic-y), $(header-y)) > -all-files := $(header-y) $(genhdr-y) $(wrapper-files) > +all-files := $(header-files) $(genhdr-files) $(wrapper-files) > output-files := $(addprefix $(installdir)/, $(all-files)) > > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > - $(if $(wildcard $(srcdir)/$(hdr)),, \ > - $(error Missing UAPI file $(srcdir)/$(hdr)) \ > - )) > -$(foreach hdr, $(genhdr-y), \ > - $(if $(wildcard $(gendir)/$(hdr)),, \ > - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ > - )) > - > # Work out what needs to be removed > oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > unwanted := $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > file$(if $(word 2, $(all-files)),s)) > cmd_install = \ > - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > for F in $(wrapper-files); do \ > echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ > done; \ > -- > 2.8.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-doc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-06 9:43 ` Nicolas Dichtel ` (5 preceding siblings ...) (?) @ 2017-01-09 10:01 ` Daniel Vetter -1 siblings, 0 replies; 554+ messages in thread From: Daniel Vetter @ 2017-01-09 10:01 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Makes lots of sense. Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > Documentation/kbuild/makefiles.txt | 41 ++- > arch/alpha/include/uapi/asm/Kbuild | 41 --- > arch/arc/include/uapi/asm/Kbuild | 3 - > arch/arm/include/uapi/asm/Kbuild | 17 - > arch/arm64/include/uapi/asm/Kbuild | 18 -- > arch/avr32/include/uapi/asm/Kbuild | 20 -- > arch/blackfin/include/uapi/asm/Kbuild | 17 - > arch/c6x/include/uapi/asm/Kbuild | 8 - > arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - > arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - > arch/cris/include/uapi/asm/Kbuild | 43 +-- > arch/frv/include/uapi/asm/Kbuild | 33 -- > arch/h8300/include/uapi/asm/Kbuild | 28 -- > arch/hexagon/include/asm/Kbuild | 3 - > arch/hexagon/include/uapi/asm/Kbuild | 13 - > arch/ia64/include/uapi/asm/Kbuild | 45 --- > arch/m32r/include/uapi/asm/Kbuild | 31 -- > arch/m68k/include/uapi/asm/Kbuild | 24 -- > arch/metag/include/uapi/asm/Kbuild | 8 - > arch/microblaze/include/uapi/asm/Kbuild | 32 -- > arch/mips/include/uapi/asm/Kbuild | 37 --- > arch/mn10300/include/uapi/asm/Kbuild | 32 -- > arch/nios2/include/uapi/asm/Kbuild | 4 +- > arch/openrisc/include/asm/Kbuild | 3 - > arch/openrisc/include/uapi/asm/Kbuild | 8 - > arch/parisc/include/uapi/asm/Kbuild | 28 -- > arch/powerpc/include/uapi/asm/Kbuild | 45 --- > arch/s390/include/uapi/asm/Kbuild | 52 --- > arch/score/include/asm/Kbuild | 4 - > arch/score/include/uapi/asm/Kbuild | 32 -- > arch/sh/include/uapi/asm/Kbuild | 23 -- > arch/sparc/include/uapi/asm/Kbuild | 48 --- > arch/tile/include/asm/Kbuild | 3 - > arch/tile/include/uapi/arch/Kbuild | 17 - > arch/tile/include/uapi/asm/Kbuild | 19 +- > arch/unicore32/include/uapi/asm/Kbuild | 6 - > arch/x86/include/uapi/asm/Kbuild | 59 ---- > arch/xtensa/include/uapi/asm/Kbuild | 23 -- > include/Kbuild | 2 - > include/asm-generic/Kbuild.asm | 1 - > include/scsi/fc/Kbuild | 0 > include/uapi/Kbuild | 15 - > include/uapi/asm-generic/Kbuild | 36 --- > include/uapi/asm-generic/Kbuild.asm | 62 ++-- > include/uapi/drm/Kbuild | 22 -- > include/uapi/linux/Kbuild | 482 ---------------------------- > include/uapi/linux/android/Kbuild | 2 - > include/uapi/linux/byteorder/Kbuild | 3 - > include/uapi/linux/caif/Kbuild | 3 - > include/uapi/linux/can/Kbuild | 6 - > include/uapi/linux/dvb/Kbuild | 9 - > include/uapi/linux/hdlc/Kbuild | 2 - > include/uapi/linux/hsi/Kbuild | 2 - > include/uapi/linux/iio/Kbuild | 3 - > include/uapi/linux/isdn/Kbuild | 2 - > include/uapi/linux/mmc/Kbuild | 2 - > include/uapi/linux/netfilter/Kbuild | 89 ----- > include/uapi/linux/netfilter/ipset/Kbuild | 5 - > include/uapi/linux/netfilter_arp/Kbuild | 3 - > include/uapi/linux/netfilter_bridge/Kbuild | 18 -- > include/uapi/linux/netfilter_ipv4/Kbuild | 10 - > include/uapi/linux/netfilter_ipv6/Kbuild | 13 - > include/uapi/linux/nfsd/Kbuild | 6 - > include/uapi/linux/raid/Kbuild | 3 - > include/uapi/linux/spi/Kbuild | 2 - > include/uapi/linux/sunrpc/Kbuild | 2 - > include/uapi/linux/tc_act/Kbuild | 15 - > include/uapi/linux/tc_ematch/Kbuild | 5 - > include/uapi/linux/usb/Kbuild | 12 - > include/uapi/linux/wimax/Kbuild | 2 - > include/uapi/misc/Kbuild | 2 - > include/uapi/mtd/Kbuild | 6 - > include/uapi/rdma/Kbuild | 18 -- > include/uapi/rdma/hfi/Kbuild | 2 - > include/uapi/scsi/Kbuild | 6 - > include/uapi/scsi/fc/Kbuild | 5 - > include/uapi/sound/Kbuild | 16 - > include/uapi/video/Kbuild | 4 - > include/uapi/xen/Kbuild | 5 - > include/video/Kbuild | 0 > scripts/Makefile.headersinst | 39 +-- > 81 files changed, 73 insertions(+), 1745 deletions(-) > delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > delete mode 100644 arch/tile/include/uapi/arch/Kbuild > delete mode 100644 include/Kbuild > delete mode 100644 include/asm-generic/Kbuild.asm > delete mode 100644 include/scsi/fc/Kbuild > delete mode 100644 include/uapi/Kbuild > delete mode 100644 include/uapi/asm-generic/Kbuild > delete mode 100644 include/uapi/drm/Kbuild > delete mode 100644 include/uapi/linux/Kbuild > delete mode 100644 include/uapi/linux/android/Kbuild > delete mode 100644 include/uapi/linux/byteorder/Kbuild > delete mode 100644 include/uapi/linux/caif/Kbuild > delete mode 100644 include/uapi/linux/can/Kbuild > delete mode 100644 include/uapi/linux/dvb/Kbuild > delete mode 100644 include/uapi/linux/hdlc/Kbuild > delete mode 100644 include/uapi/linux/hsi/Kbuild > delete mode 100644 include/uapi/linux/iio/Kbuild > delete mode 100644 include/uapi/linux/isdn/Kbuild > delete mode 100644 include/uapi/linux/mmc/Kbuild > delete mode 100644 include/uapi/linux/netfilter/Kbuild > delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > delete mode 100644 include/uapi/linux/nfsd/Kbuild > delete mode 100644 include/uapi/linux/raid/Kbuild > delete mode 100644 include/uapi/linux/spi/Kbuild > delete mode 100644 include/uapi/linux/sunrpc/Kbuild > delete mode 100644 include/uapi/linux/tc_act/Kbuild > delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > delete mode 100644 include/uapi/linux/usb/Kbuild > delete mode 100644 include/uapi/linux/wimax/Kbuild > delete mode 100644 include/uapi/misc/Kbuild > delete mode 100644 include/uapi/mtd/Kbuild > delete mode 100644 include/uapi/rdma/Kbuild > delete mode 100644 include/uapi/rdma/hfi/Kbuild > delete mode 100644 include/uapi/scsi/Kbuild > delete mode 100644 include/uapi/scsi/fc/Kbuild > delete mode 100644 include/uapi/sound/Kbuild > delete mode 100644 include/uapi/video/Kbuild > delete mode 100644 include/uapi/xen/Kbuild > delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > --- 6.11 Post-link pass > > == 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > --- 7.2 genhdr-y > --- 7.3 generic-y > --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > that may be shared between individual architectures. > The recommended approach how to use a generic header file is > to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > > --- 6.11 Post-link pass > > @@ -1262,37 +1262,36 @@ The pre-processing does: > - drop include of compiler.h > - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > See subsequent chapter for the syntax of the Kbuild file. > > - --- 7.1 header-y > + --- 7.1 subdir-y > > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > > Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > > - The convention is to list one file per line and > + The convention is to list one subdir per line and > preferably in alphabetic order. > > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > --- 7.2 genhdr-y > > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > > Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > > --- 7.3 generic-y > > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > generic-y += bitsperlong.h > generic-y += errno.h > generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += auxvec.h > generic-y += barrier.h > generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > generic-y += sockios.h > generic-y += termbits.h > generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > generic-y += mman.h > generic-y += resource.h > generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += atomic.h > generic-y += auxvec.h > generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y +> - > - > generic-y += barrier.h > generic-y += clkdev.h > generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > # UAPI Header export list > -# User exported sparc header files > - > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > generic-y += bug.h > generic-y += bugs.h > generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > genhdr-y += unistd_32.h > genhdr-y += unistd_64.h > genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > $(if \ > $(wildcard \ > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > # ===================================== > # Installing headers > # > -# header-y - list files to be installed. They are preprocessed > -# to remove __KERNEL__ section of the file > -# genhdr-y - Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > # > # ===================================== > > # generated header directory > gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > > +# Kbuild file is optional > kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > > # called may set destination dir (when installing to asm/) > _dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > > installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > > -header-y := $(sort $(header-y)) > -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y := $(filter-out %/, $(header-y)) > +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs += $(subdir-y) > +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) > > # files used to track state of install/check > install-file := $(installdir)/.install > @@ -35,26 +39,17 @@ check-file := $(installdir)/.check > > # generic-y list all files an architecture uses from asm-generic > # Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > > srcdir := $(srctree)/$(obj) > gendir := $(objtree)/$(gen) > > # all headers files for this dir > -header-y := $(filter-out $(generic-y), $(header-y)) > -all-files := $(header-y) $(genhdr-y) $(wrapper-files) > +all-files := $(header-files) $(genhdr-files) $(wrapper-files) > output-files := $(addprefix $(installdir)/, $(all-files)) > > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > - $(if $(wildcard $(srcdir)/$(hdr)),, \ > - $(error Missing UAPI file $(srcdir)/$(hdr)) \ > - )) > -$(foreach hdr, $(genhdr-y), \ > - $(if $(wildcard $(gendir)/$(hdr)),, \ > - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ > - )) > - > # Work out what needs to be removed > oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > unwanted := $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > file$(if $(word 2, $(all-files)),s)) > cmd_install = \ > - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > for F in $(wrapper-files); do \ > echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ > done; \ > -- > 2.8.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-doc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 10:01 ` Daniel Vetter 0 siblings, 0 replies; 554+ messages in thread From: Daniel Vetter @ 2017-01-09 10:01 UTC (permalink / raw) To: openrisc On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Makes lots of sense. Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > Documentation/kbuild/makefiles.txt | 41 ++- > arch/alpha/include/uapi/asm/Kbuild | 41 --- > arch/arc/include/uapi/asm/Kbuild | 3 - > arch/arm/include/uapi/asm/Kbuild | 17 - > arch/arm64/include/uapi/asm/Kbuild | 18 -- > arch/avr32/include/uapi/asm/Kbuild | 20 -- > arch/blackfin/include/uapi/asm/Kbuild | 17 - > arch/c6x/include/uapi/asm/Kbuild | 8 - > arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - > arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - > arch/cris/include/uapi/asm/Kbuild | 43 +-- > arch/frv/include/uapi/asm/Kbuild | 33 -- > arch/h8300/include/uapi/asm/Kbuild | 28 -- > arch/hexagon/include/asm/Kbuild | 3 - > arch/hexagon/include/uapi/asm/Kbuild | 13 - > arch/ia64/include/uapi/asm/Kbuild | 45 --- > arch/m32r/include/uapi/asm/Kbuild | 31 -- > arch/m68k/include/uapi/asm/Kbuild | 24 -- > arch/metag/include/uapi/asm/Kbuild | 8 - > arch/microblaze/include/uapi/asm/Kbuild | 32 -- > arch/mips/include/uapi/asm/Kbuild | 37 --- > arch/mn10300/include/uapi/asm/Kbuild | 32 -- > arch/nios2/include/uapi/asm/Kbuild | 4 +- > arch/openrisc/include/asm/Kbuild | 3 - > arch/openrisc/include/uapi/asm/Kbuild | 8 - > arch/parisc/include/uapi/asm/Kbuild | 28 -- > arch/powerpc/include/uapi/asm/Kbuild | 45 --- > arch/s390/include/uapi/asm/Kbuild | 52 --- > arch/score/include/asm/Kbuild | 4 - > arch/score/include/uapi/asm/Kbuild | 32 -- > arch/sh/include/uapi/asm/Kbuild | 23 -- > arch/sparc/include/uapi/asm/Kbuild | 48 --- > arch/tile/include/asm/Kbuild | 3 - > arch/tile/include/uapi/arch/Kbuild | 17 - > arch/tile/include/uapi/asm/Kbuild | 19 +- > arch/unicore32/include/uapi/asm/Kbuild | 6 - > arch/x86/include/uapi/asm/Kbuild | 59 ---- > arch/xtensa/include/uapi/asm/Kbuild | 23 -- > include/Kbuild | 2 - > include/asm-generic/Kbuild.asm | 1 - > include/scsi/fc/Kbuild | 0 > include/uapi/Kbuild | 15 - > include/uapi/asm-generic/Kbuild | 36 --- > include/uapi/asm-generic/Kbuild.asm | 62 ++-- > include/uapi/drm/Kbuild | 22 -- > include/uapi/linux/Kbuild | 482 ---------------------------- > include/uapi/linux/android/Kbuild | 2 - > include/uapi/linux/byteorder/Kbuild | 3 - > include/uapi/linux/caif/Kbuild | 3 - > include/uapi/linux/can/Kbuild | 6 - > include/uapi/linux/dvb/Kbuild | 9 - > include/uapi/linux/hdlc/Kbuild | 2 - > include/uapi/linux/hsi/Kbuild | 2 - > include/uapi/linux/iio/Kbuild | 3 - > include/uapi/linux/isdn/Kbuild | 2 - > include/uapi/linux/mmc/Kbuild | 2 - > include/uapi/linux/netfilter/Kbuild | 89 ----- > include/uapi/linux/netfilter/ipset/Kbuild | 5 - > include/uapi/linux/netfilter_arp/Kbuild | 3 - > include/uapi/linux/netfilter_bridge/Kbuild | 18 -- > include/uapi/linux/netfilter_ipv4/Kbuild | 10 - > include/uapi/linux/netfilter_ipv6/Kbuild | 13 - > include/uapi/linux/nfsd/Kbuild | 6 - > include/uapi/linux/raid/Kbuild | 3 - > include/uapi/linux/spi/Kbuild | 2 - > include/uapi/linux/sunrpc/Kbuild | 2 - > include/uapi/linux/tc_act/Kbuild | 15 - > include/uapi/linux/tc_ematch/Kbuild | 5 - > include/uapi/linux/usb/Kbuild | 12 - > include/uapi/linux/wimax/Kbuild | 2 - > include/uapi/misc/Kbuild | 2 - > include/uapi/mtd/Kbuild | 6 - > include/uapi/rdma/Kbuild | 18 -- > include/uapi/rdma/hfi/Kbuild | 2 - > include/uapi/scsi/Kbuild | 6 - > include/uapi/scsi/fc/Kbuild | 5 - > include/uapi/sound/Kbuild | 16 - > include/uapi/video/Kbuild | 4 - > include/uapi/xen/Kbuild | 5 - > include/video/Kbuild | 0 > scripts/Makefile.headersinst | 39 +-- > 81 files changed, 73 insertions(+), 1745 deletions(-) > delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > delete mode 100644 arch/tile/include/uapi/arch/Kbuild > delete mode 100644 include/Kbuild > delete mode 100644 include/asm-generic/Kbuild.asm > delete mode 100644 include/scsi/fc/Kbuild > delete mode 100644 include/uapi/Kbuild > delete mode 100644 include/uapi/asm-generic/Kbuild > delete mode 100644 include/uapi/drm/Kbuild > delete mode 100644 include/uapi/linux/Kbuild > delete mode 100644 include/uapi/linux/android/Kbuild > delete mode 100644 include/uapi/linux/byteorder/Kbuild > delete mode 100644 include/uapi/linux/caif/Kbuild > delete mode 100644 include/uapi/linux/can/Kbuild > delete mode 100644 include/uapi/linux/dvb/Kbuild > delete mode 100644 include/uapi/linux/hdlc/Kbuild > delete mode 100644 include/uapi/linux/hsi/Kbuild > delete mode 100644 include/uapi/linux/iio/Kbuild > delete mode 100644 include/uapi/linux/isdn/Kbuild > delete mode 100644 include/uapi/linux/mmc/Kbuild > delete mode 100644 include/uapi/linux/netfilter/Kbuild > delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > delete mode 100644 include/uapi/linux/nfsd/Kbuild > delete mode 100644 include/uapi/linux/raid/Kbuild > delete mode 100644 include/uapi/linux/spi/Kbuild > delete mode 100644 include/uapi/linux/sunrpc/Kbuild > delete mode 100644 include/uapi/linux/tc_act/Kbuild > delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > delete mode 100644 include/uapi/linux/usb/Kbuild > delete mode 100644 include/uapi/linux/wimax/Kbuild > delete mode 100644 include/uapi/misc/Kbuild > delete mode 100644 include/uapi/mtd/Kbuild > delete mode 100644 include/uapi/rdma/Kbuild > delete mode 100644 include/uapi/rdma/hfi/Kbuild > delete mode 100644 include/uapi/scsi/Kbuild > delete mode 100644 include/uapi/scsi/fc/Kbuild > delete mode 100644 include/uapi/sound/Kbuild > delete mode 100644 include/uapi/video/Kbuild > delete mode 100644 include/uapi/xen/Kbuild > delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > --- 6.11 Post-link pass > > === 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > --- 7.2 genhdr-y > --- 7.3 generic-y > --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > that may be shared between individual architectures. > The recommended approach how to use a generic header file is > to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > > --- 6.11 Post-link pass > > @@ -1262,37 +1262,36 @@ The pre-processing does: > - drop include of compiler.h > - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > See subsequent chapter for the syntax of the Kbuild file. > > - --- 7.1 header-y > + --- 7.1 subdir-y > > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > > Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > > - The convention is to list one file per line and > + The convention is to list one subdir per line and > preferably in alphabetic order. > > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > --- 7.2 genhdr-y > > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > > Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > > --- 7.3 generic-y > > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > generic-y += bitsperlong.h > generic-y += errno.h > generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += auxvec.h > generic-y += barrier.h > generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > generic-y += sockios.h > generic-y += termbits.h > generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > generic-y += mman.h > generic-y += resource.h > generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += atomic.h > generic-y += auxvec.h > generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y += > - > - > generic-y += barrier.h > generic-y += clkdev.h > generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > # UAPI Header export list > -# User exported sparc header files > - > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > generic-y += bug.h > generic-y += bugs.h > generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > genhdr-y += unistd_32.h > genhdr-y += unistd_64.h > genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > $(if \ > $(wildcard \ > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > # ========================================================================== > # Installing headers > # > -# header-y - list files to be installed. They are preprocessed > -# to remove __KERNEL__ section of the file > -# genhdr-y - Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > # > # ========================================================================== > > # generated header directory > gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > > +# Kbuild file is optional > kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > > # called may set destination dir (when installing to asm/) > _dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > > installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > > -header-y := $(sort $(header-y)) > -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y := $(filter-out %/, $(header-y)) > +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs += $(subdir-y) > +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) > > # files used to track state of install/check > install-file := $(installdir)/.install > @@ -35,26 +39,17 @@ check-file := $(installdir)/.check > > # generic-y list all files an architecture uses from asm-generic > # Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > > srcdir := $(srctree)/$(obj) > gendir := $(objtree)/$(gen) > > # all headers files for this dir > -header-y := $(filter-out $(generic-y), $(header-y)) > -all-files := $(header-y) $(genhdr-y) $(wrapper-files) > +all-files := $(header-files) $(genhdr-files) $(wrapper-files) > output-files := $(addprefix $(installdir)/, $(all-files)) > > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > - $(if $(wildcard $(srcdir)/$(hdr)),, \ > - $(error Missing UAPI file $(srcdir)/$(hdr)) \ > - )) > -$(foreach hdr, $(genhdr-y), \ > - $(if $(wildcard $(gendir)/$(hdr)),, \ > - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ > - )) > - > # Work out what needs to be removed > oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > unwanted := $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > file$(if $(word 2, $(all-files)),s)) > cmd_install = \ > - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > for F in $(wrapper-files); do \ > echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ > done; \ > -- > 2.8.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-doc" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 10:01 ` Daniel Vetter 0 siblings, 0 replies; 554+ messages in thread From: Daniel Vetter @ 2017-01-09 10:01 UTC (permalink / raw) To: linux-arm-kernel On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Makes lots of sense. Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > Documentation/kbuild/makefiles.txt | 41 ++- > arch/alpha/include/uapi/asm/Kbuild | 41 --- > arch/arc/include/uapi/asm/Kbuild | 3 - > arch/arm/include/uapi/asm/Kbuild | 17 - > arch/arm64/include/uapi/asm/Kbuild | 18 -- > arch/avr32/include/uapi/asm/Kbuild | 20 -- > arch/blackfin/include/uapi/asm/Kbuild | 17 - > arch/c6x/include/uapi/asm/Kbuild | 8 - > arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - > arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - > arch/cris/include/uapi/asm/Kbuild | 43 +-- > arch/frv/include/uapi/asm/Kbuild | 33 -- > arch/h8300/include/uapi/asm/Kbuild | 28 -- > arch/hexagon/include/asm/Kbuild | 3 - > arch/hexagon/include/uapi/asm/Kbuild | 13 - > arch/ia64/include/uapi/asm/Kbuild | 45 --- > arch/m32r/include/uapi/asm/Kbuild | 31 -- > arch/m68k/include/uapi/asm/Kbuild | 24 -- > arch/metag/include/uapi/asm/Kbuild | 8 - > arch/microblaze/include/uapi/asm/Kbuild | 32 -- > arch/mips/include/uapi/asm/Kbuild | 37 --- > arch/mn10300/include/uapi/asm/Kbuild | 32 -- > arch/nios2/include/uapi/asm/Kbuild | 4 +- > arch/openrisc/include/asm/Kbuild | 3 - > arch/openrisc/include/uapi/asm/Kbuild | 8 - > arch/parisc/include/uapi/asm/Kbuild | 28 -- > arch/powerpc/include/uapi/asm/Kbuild | 45 --- > arch/s390/include/uapi/asm/Kbuild | 52 --- > arch/score/include/asm/Kbuild | 4 - > arch/score/include/uapi/asm/Kbuild | 32 -- > arch/sh/include/uapi/asm/Kbuild | 23 -- > arch/sparc/include/uapi/asm/Kbuild | 48 --- > arch/tile/include/asm/Kbuild | 3 - > arch/tile/include/uapi/arch/Kbuild | 17 - > arch/tile/include/uapi/asm/Kbuild | 19 +- > arch/unicore32/include/uapi/asm/Kbuild | 6 - > arch/x86/include/uapi/asm/Kbuild | 59 ---- > arch/xtensa/include/uapi/asm/Kbuild | 23 -- > include/Kbuild | 2 - > include/asm-generic/Kbuild.asm | 1 - > include/scsi/fc/Kbuild | 0 > include/uapi/Kbuild | 15 - > include/uapi/asm-generic/Kbuild | 36 --- > include/uapi/asm-generic/Kbuild.asm | 62 ++-- > include/uapi/drm/Kbuild | 22 -- > include/uapi/linux/Kbuild | 482 ---------------------------- > include/uapi/linux/android/Kbuild | 2 - > include/uapi/linux/byteorder/Kbuild | 3 - > include/uapi/linux/caif/Kbuild | 3 - > include/uapi/linux/can/Kbuild | 6 - > include/uapi/linux/dvb/Kbuild | 9 - > include/uapi/linux/hdlc/Kbuild | 2 - > include/uapi/linux/hsi/Kbuild | 2 - > include/uapi/linux/iio/Kbuild | 3 - > include/uapi/linux/isdn/Kbuild | 2 - > include/uapi/linux/mmc/Kbuild | 2 - > include/uapi/linux/netfilter/Kbuild | 89 ----- > include/uapi/linux/netfilter/ipset/Kbuild | 5 - > include/uapi/linux/netfilter_arp/Kbuild | 3 - > include/uapi/linux/netfilter_bridge/Kbuild | 18 -- > include/uapi/linux/netfilter_ipv4/Kbuild | 10 - > include/uapi/linux/netfilter_ipv6/Kbuild | 13 - > include/uapi/linux/nfsd/Kbuild | 6 - > include/uapi/linux/raid/Kbuild | 3 - > include/uapi/linux/spi/Kbuild | 2 - > include/uapi/linux/sunrpc/Kbuild | 2 - > include/uapi/linux/tc_act/Kbuild | 15 - > include/uapi/linux/tc_ematch/Kbuild | 5 - > include/uapi/linux/usb/Kbuild | 12 - > include/uapi/linux/wimax/Kbuild | 2 - > include/uapi/misc/Kbuild | 2 - > include/uapi/mtd/Kbuild | 6 - > include/uapi/rdma/Kbuild | 18 -- > include/uapi/rdma/hfi/Kbuild | 2 - > include/uapi/scsi/Kbuild | 6 - > include/uapi/scsi/fc/Kbuild | 5 - > include/uapi/sound/Kbuild | 16 - > include/uapi/video/Kbuild | 4 - > include/uapi/xen/Kbuild | 5 - > include/video/Kbuild | 0 > scripts/Makefile.headersinst | 39 +-- > 81 files changed, 73 insertions(+), 1745 deletions(-) > delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > delete mode 100644 arch/tile/include/uapi/arch/Kbuild > delete mode 100644 include/Kbuild > delete mode 100644 include/asm-generic/Kbuild.asm > delete mode 100644 include/scsi/fc/Kbuild > delete mode 100644 include/uapi/Kbuild > delete mode 100644 include/uapi/asm-generic/Kbuild > delete mode 100644 include/uapi/drm/Kbuild > delete mode 100644 include/uapi/linux/Kbuild > delete mode 100644 include/uapi/linux/android/Kbuild > delete mode 100644 include/uapi/linux/byteorder/Kbuild > delete mode 100644 include/uapi/linux/caif/Kbuild > delete mode 100644 include/uapi/linux/can/Kbuild > delete mode 100644 include/uapi/linux/dvb/Kbuild > delete mode 100644 include/uapi/linux/hdlc/Kbuild > delete mode 100644 include/uapi/linux/hsi/Kbuild > delete mode 100644 include/uapi/linux/iio/Kbuild > delete mode 100644 include/uapi/linux/isdn/Kbuild > delete mode 100644 include/uapi/linux/mmc/Kbuild > delete mode 100644 include/uapi/linux/netfilter/Kbuild > delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > delete mode 100644 include/uapi/linux/nfsd/Kbuild > delete mode 100644 include/uapi/linux/raid/Kbuild > delete mode 100644 include/uapi/linux/spi/Kbuild > delete mode 100644 include/uapi/linux/sunrpc/Kbuild > delete mode 100644 include/uapi/linux/tc_act/Kbuild > delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > delete mode 100644 include/uapi/linux/usb/Kbuild > delete mode 100644 include/uapi/linux/wimax/Kbuild > delete mode 100644 include/uapi/misc/Kbuild > delete mode 100644 include/uapi/mtd/Kbuild > delete mode 100644 include/uapi/rdma/Kbuild > delete mode 100644 include/uapi/rdma/hfi/Kbuild > delete mode 100644 include/uapi/scsi/Kbuild > delete mode 100644 include/uapi/scsi/fc/Kbuild > delete mode 100644 include/uapi/sound/Kbuild > delete mode 100644 include/uapi/video/Kbuild > delete mode 100644 include/uapi/xen/Kbuild > delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > --- 6.11 Post-link pass > > === 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > --- 7.2 genhdr-y > --- 7.3 generic-y > --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > that may be shared between individual architectures. > The recommended approach how to use a generic header file is > to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > > --- 6.11 Post-link pass > > @@ -1262,37 +1262,36 @@ The pre-processing does: > - drop include of compiler.h > - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > See subsequent chapter for the syntax of the Kbuild file. > > - --- 7.1 header-y > + --- 7.1 subdir-y > > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > > Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > > - The convention is to list one file per line and > + The convention is to list one subdir per line and > preferably in alphabetic order. > > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > --- 7.2 genhdr-y > > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > > Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > > --- 7.3 generic-y > > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > generic-y += bitsperlong.h > generic-y += errno.h > generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += auxvec.h > generic-y += barrier.h > generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > generic-y += sockios.h > generic-y += termbits.h > generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > generic-y += mman.h > generic-y += resource.h > generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += atomic.h > generic-y += auxvec.h > generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y += > - > - > generic-y += barrier.h > generic-y += clkdev.h > generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > # UAPI Header export list > -# User exported sparc header files > - > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > generic-y += bug.h > generic-y += bugs.h > generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > genhdr-y += unistd_32.h > genhdr-y += unistd_64.h > genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > $(if \ > $(wildcard \ > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > # ========================================================================== > # Installing headers > # > -# header-y - list files to be installed. They are preprocessed > -# to remove __KERNEL__ section of the file > -# genhdr-y - Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > # > # ========================================================================== > > # generated header directory > gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > > +# Kbuild file is optional > kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > > # called may set destination dir (when installing to asm/) > _dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > > installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > > -header-y := $(sort $(header-y)) > -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y := $(filter-out %/, $(header-y)) > +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs += $(subdir-y) > +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) > > # files used to track state of install/check > install-file := $(installdir)/.install > @@ -35,26 +39,17 @@ check-file := $(installdir)/.check > > # generic-y list all files an architecture uses from asm-generic > # Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > > srcdir := $(srctree)/$(obj) > gendir := $(objtree)/$(gen) > > # all headers files for this dir > -header-y := $(filter-out $(generic-y), $(header-y)) > -all-files := $(header-y) $(genhdr-y) $(wrapper-files) > +all-files := $(header-files) $(genhdr-files) $(wrapper-files) > output-files := $(addprefix $(installdir)/, $(all-files)) > > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > - $(if $(wildcard $(srcdir)/$(hdr)),, \ > - $(error Missing UAPI file $(srcdir)/$(hdr)) \ > - )) > -$(foreach hdr, $(genhdr-y), \ > - $(if $(wildcard $(gendir)/$(hdr)),, \ > - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ > - )) > - > # Work out what needs to be removed > oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > unwanted := $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > file$(if $(word 2, $(all-files)),s)) > cmd_install = \ > - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > for F in $(wrapper-files); do \ > echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ > done; \ > -- > 2.8.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-doc" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 10:01 ` Daniel Vetter 0 siblings, 0 replies; 554+ messages in thread From: Daniel Vetter @ 2017-01-09 10:01 UTC (permalink / raw) To: linux-snps-arc On Fri, Jan 06, 2017@10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret at 6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> Makes lots of sense. Acked-by: Daniel Vetter <daniel.vetter at ffwll.ch> > --- > Documentation/kbuild/makefiles.txt | 41 ++- > arch/alpha/include/uapi/asm/Kbuild | 41 --- > arch/arc/include/uapi/asm/Kbuild | 3 - > arch/arm/include/uapi/asm/Kbuild | 17 - > arch/arm64/include/uapi/asm/Kbuild | 18 -- > arch/avr32/include/uapi/asm/Kbuild | 20 -- > arch/blackfin/include/uapi/asm/Kbuild | 17 - > arch/c6x/include/uapi/asm/Kbuild | 8 - > arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - > arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - > arch/cris/include/uapi/asm/Kbuild | 43 +-- > arch/frv/include/uapi/asm/Kbuild | 33 -- > arch/h8300/include/uapi/asm/Kbuild | 28 -- > arch/hexagon/include/asm/Kbuild | 3 - > arch/hexagon/include/uapi/asm/Kbuild | 13 - > arch/ia64/include/uapi/asm/Kbuild | 45 --- > arch/m32r/include/uapi/asm/Kbuild | 31 -- > arch/m68k/include/uapi/asm/Kbuild | 24 -- > arch/metag/include/uapi/asm/Kbuild | 8 - > arch/microblaze/include/uapi/asm/Kbuild | 32 -- > arch/mips/include/uapi/asm/Kbuild | 37 --- > arch/mn10300/include/uapi/asm/Kbuild | 32 -- > arch/nios2/include/uapi/asm/Kbuild | 4 +- > arch/openrisc/include/asm/Kbuild | 3 - > arch/openrisc/include/uapi/asm/Kbuild | 8 - > arch/parisc/include/uapi/asm/Kbuild | 28 -- > arch/powerpc/include/uapi/asm/Kbuild | 45 --- > arch/s390/include/uapi/asm/Kbuild | 52 --- > arch/score/include/asm/Kbuild | 4 - > arch/score/include/uapi/asm/Kbuild | 32 -- > arch/sh/include/uapi/asm/Kbuild | 23 -- > arch/sparc/include/uapi/asm/Kbuild | 48 --- > arch/tile/include/asm/Kbuild | 3 - > arch/tile/include/uapi/arch/Kbuild | 17 - > arch/tile/include/uapi/asm/Kbuild | 19 +- > arch/unicore32/include/uapi/asm/Kbuild | 6 - > arch/x86/include/uapi/asm/Kbuild | 59 ---- > arch/xtensa/include/uapi/asm/Kbuild | 23 -- > include/Kbuild | 2 - > include/asm-generic/Kbuild.asm | 1 - > include/scsi/fc/Kbuild | 0 > include/uapi/Kbuild | 15 - > include/uapi/asm-generic/Kbuild | 36 --- > include/uapi/asm-generic/Kbuild.asm | 62 ++-- > include/uapi/drm/Kbuild | 22 -- > include/uapi/linux/Kbuild | 482 ---------------------------- > include/uapi/linux/android/Kbuild | 2 - > include/uapi/linux/byteorder/Kbuild | 3 - > include/uapi/linux/caif/Kbuild | 3 - > include/uapi/linux/can/Kbuild | 6 - > include/uapi/linux/dvb/Kbuild | 9 - > include/uapi/linux/hdlc/Kbuild | 2 - > include/uapi/linux/hsi/Kbuild | 2 - > include/uapi/linux/iio/Kbuild | 3 - > include/uapi/linux/isdn/Kbuild | 2 - > include/uapi/linux/mmc/Kbuild | 2 - > include/uapi/linux/netfilter/Kbuild | 89 ----- > include/uapi/linux/netfilter/ipset/Kbuild | 5 - > include/uapi/linux/netfilter_arp/Kbuild | 3 - > include/uapi/linux/netfilter_bridge/Kbuild | 18 -- > include/uapi/linux/netfilter_ipv4/Kbuild | 10 - > include/uapi/linux/netfilter_ipv6/Kbuild | 13 - > include/uapi/linux/nfsd/Kbuild | 6 - > include/uapi/linux/raid/Kbuild | 3 - > include/uapi/linux/spi/Kbuild | 2 - > include/uapi/linux/sunrpc/Kbuild | 2 - > include/uapi/linux/tc_act/Kbuild | 15 - > include/uapi/linux/tc_ematch/Kbuild | 5 - > include/uapi/linux/usb/Kbuild | 12 - > include/uapi/linux/wimax/Kbuild | 2 - > include/uapi/misc/Kbuild | 2 - > include/uapi/mtd/Kbuild | 6 - > include/uapi/rdma/Kbuild | 18 -- > include/uapi/rdma/hfi/Kbuild | 2 - > include/uapi/scsi/Kbuild | 6 - > include/uapi/scsi/fc/Kbuild | 5 - > include/uapi/sound/Kbuild | 16 - > include/uapi/video/Kbuild | 4 - > include/uapi/xen/Kbuild | 5 - > include/video/Kbuild | 0 > scripts/Makefile.headersinst | 39 +-- > 81 files changed, 73 insertions(+), 1745 deletions(-) > delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > delete mode 100644 arch/tile/include/uapi/arch/Kbuild > delete mode 100644 include/Kbuild > delete mode 100644 include/asm-generic/Kbuild.asm > delete mode 100644 include/scsi/fc/Kbuild > delete mode 100644 include/uapi/Kbuild > delete mode 100644 include/uapi/asm-generic/Kbuild > delete mode 100644 include/uapi/drm/Kbuild > delete mode 100644 include/uapi/linux/Kbuild > delete mode 100644 include/uapi/linux/android/Kbuild > delete mode 100644 include/uapi/linux/byteorder/Kbuild > delete mode 100644 include/uapi/linux/caif/Kbuild > delete mode 100644 include/uapi/linux/can/Kbuild > delete mode 100644 include/uapi/linux/dvb/Kbuild > delete mode 100644 include/uapi/linux/hdlc/Kbuild > delete mode 100644 include/uapi/linux/hsi/Kbuild > delete mode 100644 include/uapi/linux/iio/Kbuild > delete mode 100644 include/uapi/linux/isdn/Kbuild > delete mode 100644 include/uapi/linux/mmc/Kbuild > delete mode 100644 include/uapi/linux/netfilter/Kbuild > delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > delete mode 100644 include/uapi/linux/nfsd/Kbuild > delete mode 100644 include/uapi/linux/raid/Kbuild > delete mode 100644 include/uapi/linux/spi/Kbuild > delete mode 100644 include/uapi/linux/sunrpc/Kbuild > delete mode 100644 include/uapi/linux/tc_act/Kbuild > delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > delete mode 100644 include/uapi/linux/usb/Kbuild > delete mode 100644 include/uapi/linux/wimax/Kbuild > delete mode 100644 include/uapi/misc/Kbuild > delete mode 100644 include/uapi/mtd/Kbuild > delete mode 100644 include/uapi/rdma/Kbuild > delete mode 100644 include/uapi/rdma/hfi/Kbuild > delete mode 100644 include/uapi/scsi/Kbuild > delete mode 100644 include/uapi/scsi/fc/Kbuild > delete mode 100644 include/uapi/sound/Kbuild > delete mode 100644 include/uapi/video/Kbuild > delete mode 100644 include/uapi/xen/Kbuild > delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > --- 6.11 Post-link pass > > === 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > --- 7.2 genhdr-y > --- 7.3 generic-y > --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > that may be shared between individual architectures. > The recommended approach how to use a generic header file is > to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > > --- 6.11 Post-link pass > > @@ -1262,37 +1262,36 @@ The pre-processing does: > - drop include of compiler.h > - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > See subsequent chapter for the syntax of the Kbuild file. > > - --- 7.1 header-y > + --- 7.1 subdir-y > > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > > Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > > - The convention is to list one file per line and > + The convention is to list one subdir per line and > preferably in alphabetic order. > > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > --- 7.2 genhdr-y > > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > > Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > > --- 7.3 generic-y > > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > generic-y += bitsperlong.h > generic-y += errno.h > generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += auxvec.h > generic-y += barrier.h > generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > generic-y += sockios.h > generic-y += termbits.h > generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > generic-y += mman.h > generic-y += resource.h > generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += atomic.h > generic-y += auxvec.h > generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y += > - > - > generic-y += barrier.h > generic-y += clkdev.h > generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > # UAPI Header export list > -# User exported sparc header files > - > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > generic-y += bug.h > generic-y += bugs.h > generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > genhdr-y += unistd_32.h > genhdr-y += unistd_64.h > genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > $(if \ > $(wildcard \ > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > # ========================================================================== > # Installing headers > # > -# header-y - list files to be installed. They are preprocessed > -# to remove __KERNEL__ section of the file > -# genhdr-y - Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > # > # ========================================================================== > > # generated header directory > gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > > +# Kbuild file is optional > kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > > # called may set destination dir (when installing to asm/) > _dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > > installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > > -header-y := $(sort $(header-y)) > -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y := $(filter-out %/, $(header-y)) > +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs += $(subdir-y) > +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) > > # files used to track state of install/check > install-file := $(installdir)/.install > @@ -35,26 +39,17 @@ check-file := $(installdir)/.check > > # generic-y list all files an architecture uses from asm-generic > # Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > > srcdir := $(srctree)/$(obj) > gendir := $(objtree)/$(gen) > > # all headers files for this dir > -header-y := $(filter-out $(generic-y), $(header-y)) > -all-files := $(header-y) $(genhdr-y) $(wrapper-files) > +all-files := $(header-files) $(genhdr-files) $(wrapper-files) > output-files := $(addprefix $(installdir)/, $(all-files)) > > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > - $(if $(wildcard $(srcdir)/$(hdr)),, \ > - $(error Missing UAPI file $(srcdir)/$(hdr)) \ > - )) > -$(foreach hdr, $(genhdr-y), \ > - $(if $(wildcard $(gendir)/$(hdr)),, \ > - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ > - )) > - > # Work out what needs to be removed > oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > unwanted := $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > file$(if $(word 2, $(all-files)),s)) > cmd_install = \ > - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > for F in $(wrapper-files); do \ > echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ > done; \ > -- > 2.8.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-doc" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 10:01 ` Daniel Vetter 0 siblings, 0 replies; 554+ messages in thread From: Daniel Vetter @ 2017-01-09 10:01 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Makes lots of sense. Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > Documentation/kbuild/makefiles.txt | 41 ++- > arch/alpha/include/uapi/asm/Kbuild | 41 --- > arch/arc/include/uapi/asm/Kbuild | 3 - > arch/arm/include/uapi/asm/Kbuild | 17 - > arch/arm64/include/uapi/asm/Kbuild | 18 -- > arch/avr32/include/uapi/asm/Kbuild | 20 -- > arch/blackfin/include/uapi/asm/Kbuild | 17 - > arch/c6x/include/uapi/asm/Kbuild | 8 - > arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - > arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - > arch/cris/include/uapi/asm/Kbuild | 43 +-- > arch/frv/include/uapi/asm/Kbuild | 33 -- > arch/h8300/include/uapi/asm/Kbuild | 28 -- > arch/hexagon/include/asm/Kbuild | 3 - > arch/hexagon/include/uapi/asm/Kbuild | 13 - > arch/ia64/include/uapi/asm/Kbuild | 45 --- > arch/m32r/include/uapi/asm/Kbuild | 31 -- > arch/m68k/include/uapi/asm/Kbuild | 24 -- > arch/metag/include/uapi/asm/Kbuild | 8 - > arch/microblaze/include/uapi/asm/Kbuild | 32 -- > arch/mips/include/uapi/asm/Kbuild | 37 --- > arch/mn10300/include/uapi/asm/Kbuild | 32 -- > arch/nios2/include/uapi/asm/Kbuild | 4 +- > arch/openrisc/include/asm/Kbuild | 3 - > arch/openrisc/include/uapi/asm/Kbuild | 8 - > arch/parisc/include/uapi/asm/Kbuild | 28 -- > arch/powerpc/include/uapi/asm/Kbuild | 45 --- > arch/s390/include/uapi/asm/Kbuild | 52 --- > arch/score/include/asm/Kbuild | 4 - > arch/score/include/uapi/asm/Kbuild | 32 -- > arch/sh/include/uapi/asm/Kbuild | 23 -- > arch/sparc/include/uapi/asm/Kbuild | 48 --- > arch/tile/include/asm/Kbuild | 3 - > arch/tile/include/uapi/arch/Kbuild | 17 - > arch/tile/include/uapi/asm/Kbuild | 19 +- > arch/unicore32/include/uapi/asm/Kbuild | 6 - > arch/x86/include/uapi/asm/Kbuild | 59 ---- > arch/xtensa/include/uapi/asm/Kbuild | 23 -- > include/Kbuild | 2 - > include/asm-generic/Kbuild.asm | 1 - > include/scsi/fc/Kbuild | 0 > include/uapi/Kbuild | 15 - > include/uapi/asm-generic/Kbuild | 36 --- > include/uapi/asm-generic/Kbuild.asm | 62 ++-- > include/uapi/drm/Kbuild | 22 -- > include/uapi/linux/Kbuild | 482 ---------------------------- > include/uapi/linux/android/Kbuild | 2 - > include/uapi/linux/byteorder/Kbuild | 3 - > include/uapi/linux/caif/Kbuild | 3 - > include/uapi/linux/can/Kbuild | 6 - > include/uapi/linux/dvb/Kbuild | 9 - > include/uapi/linux/hdlc/Kbuild | 2 - > include/uapi/linux/hsi/Kbuild | 2 - > include/uapi/linux/iio/Kbuild | 3 - > include/uapi/linux/isdn/Kbuild | 2 - > include/uapi/linux/mmc/Kbuild | 2 - > include/uapi/linux/netfilter/Kbuild | 89 ----- > include/uapi/linux/netfilter/ipset/Kbuild | 5 - > include/uapi/linux/netfilter_arp/Kbuild | 3 - > include/uapi/linux/netfilter_bridge/Kbuild | 18 -- > include/uapi/linux/netfilter_ipv4/Kbuild | 10 - > include/uapi/linux/netfilter_ipv6/Kbuild | 13 - > include/uapi/linux/nfsd/Kbuild | 6 - > include/uapi/linux/raid/Kbuild | 3 - > include/uapi/linux/spi/Kbuild | 2 - > include/uapi/linux/sunrpc/Kbuild | 2 - > include/uapi/linux/tc_act/Kbuild | 15 - > include/uapi/linux/tc_ematch/Kbuild | 5 - > include/uapi/linux/usb/Kbuild | 12 - > include/uapi/linux/wimax/Kbuild | 2 - > include/uapi/misc/Kbuild | 2 - > include/uapi/mtd/Kbuild | 6 - > include/uapi/rdma/Kbuild | 18 -- > include/uapi/rdma/hfi/Kbuild | 2 - > include/uapi/scsi/Kbuild | 6 - > include/uapi/scsi/fc/Kbuild | 5 - > include/uapi/sound/Kbuild | 16 - > include/uapi/video/Kbuild | 4 - > include/uapi/xen/Kbuild | 5 - > include/video/Kbuild | 0 > scripts/Makefile.headersinst | 39 +-- > 81 files changed, 73 insertions(+), 1745 deletions(-) > delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > delete mode 100644 arch/tile/include/uapi/arch/Kbuild > delete mode 100644 include/Kbuild > delete mode 100644 include/asm-generic/Kbuild.asm > delete mode 100644 include/scsi/fc/Kbuild > delete mode 100644 include/uapi/Kbuild > delete mode 100644 include/uapi/asm-generic/Kbuild > delete mode 100644 include/uapi/drm/Kbuild > delete mode 100644 include/uapi/linux/Kbuild > delete mode 100644 include/uapi/linux/android/Kbuild > delete mode 100644 include/uapi/linux/byteorder/Kbuild > delete mode 100644 include/uapi/linux/caif/Kbuild > delete mode 100644 include/uapi/linux/can/Kbuild > delete mode 100644 include/uapi/linux/dvb/Kbuild > delete mode 100644 include/uapi/linux/hdlc/Kbuild > delete mode 100644 include/uapi/linux/hsi/Kbuild > delete mode 100644 include/uapi/linux/iio/Kbuild > delete mode 100644 include/uapi/linux/isdn/Kbuild > delete mode 100644 include/uapi/linux/mmc/Kbuild > delete mode 100644 include/uapi/linux/netfilter/Kbuild > delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > delete mode 100644 include/uapi/linux/nfsd/Kbuild > delete mode 100644 include/uapi/linux/raid/Kbuild > delete mode 100644 include/uapi/linux/spi/Kbuild > delete mode 100644 include/uapi/linux/sunrpc/Kbuild > delete mode 100644 include/uapi/linux/tc_act/Kbuild > delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > delete mode 100644 include/uapi/linux/usb/Kbuild > delete mode 100644 include/uapi/linux/wimax/Kbuild > delete mode 100644 include/uapi/misc/Kbuild > delete mode 100644 include/uapi/mtd/Kbuild > delete mode 100644 include/uapi/rdma/Kbuild > delete mode 100644 include/uapi/rdma/hfi/Kbuild > delete mode 100644 include/uapi/scsi/Kbuild > delete mode 100644 include/uapi/scsi/fc/Kbuild > delete mode 100644 include/uapi/sound/Kbuild > delete mode 100644 include/uapi/video/Kbuild > delete mode 100644 include/uapi/xen/Kbuild > delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > --- 6.11 Post-link pass > > === 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > --- 7.2 genhdr-y > --- 7.3 generic-y > --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > that may be shared between individual architectures. > The recommended approach how to use a generic header file is > to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > > --- 6.11 Post-link pass > > @@ -1262,37 +1262,36 @@ The pre-processing does: > - drop include of compiler.h > - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > See subsequent chapter for the syntax of the Kbuild file. > > - --- 7.1 header-y > + --- 7.1 subdir-y > > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > > Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > > - The convention is to list one file per line and > + The convention is to list one subdir per line and > preferably in alphabetic order. > > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > --- 7.2 genhdr-y > > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > > Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > > --- 7.3 generic-y > > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > generic-y += bitsperlong.h > generic-y += errno.h > generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += auxvec.h > generic-y += barrier.h > generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > generic-y += sockios.h > generic-y += termbits.h > generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > generic-y += mman.h > generic-y += resource.h > generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += atomic.h > generic-y += auxvec.h > generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y += > - > - > generic-y += barrier.h > generic-y += clkdev.h > generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > # UAPI Header export list > -# User exported sparc header files > - > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > generic-y += bug.h > generic-y += bugs.h > generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > genhdr-y += unistd_32.h > genhdr-y += unistd_64.h > genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > $(if \ > $(wildcard \ > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > # ========================================================================== > # Installing headers > # > -# header-y - list files to be installed. They are preprocessed > -# to remove __KERNEL__ section of the file > -# genhdr-y - Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > # > # ========================================================================== > > # generated header directory > gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > > +# Kbuild file is optional > kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > > # called may set destination dir (when installing to asm/) > _dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > > installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > > -header-y := $(sort $(header-y)) > -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y := $(filter-out %/, $(header-y)) > +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs += $(subdir-y) > +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) > > # files used to track state of install/check > install-file := $(installdir)/.install > @@ -35,26 +39,17 @@ check-file := $(installdir)/.check > > # generic-y list all files an architecture uses from asm-generic > # Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > > srcdir := $(srctree)/$(obj) > gendir := $(objtree)/$(gen) > > # all headers files for this dir > -header-y := $(filter-out $(generic-y), $(header-y)) > -all-files := $(header-y) $(genhdr-y) $(wrapper-files) > +all-files := $(header-files) $(genhdr-files) $(wrapper-files) > output-files := $(addprefix $(installdir)/, $(all-files)) > > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > - $(if $(wildcard $(srcdir)/$(hdr)),, \ > - $(error Missing UAPI file $(srcdir)/$(hdr)) \ > - )) > -$(foreach hdr, $(genhdr-y), \ > - $(if $(wildcard $(gendir)/$(hdr)),, \ > - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ > - )) > - > # Work out what needs to be removed > oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > unwanted := $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > file$(if $(word 2, $(all-files)),s)) > cmd_install = \ > - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > for F in $(wrapper-files); do \ > echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ > done; \ > -- > 2.8.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-doc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 10:01 ` Daniel Vetter 0 siblings, 0 replies; 554+ messages in thread From: Daniel Vetter @ 2017-01-09 10:01 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Makes lots of sense. Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > Documentation/kbuild/makefiles.txt | 41 ++- > arch/alpha/include/uapi/asm/Kbuild | 41 --- > arch/arc/include/uapi/asm/Kbuild | 3 - > arch/arm/include/uapi/asm/Kbuild | 17 - > arch/arm64/include/uapi/asm/Kbuild | 18 -- > arch/avr32/include/uapi/asm/Kbuild | 20 -- > arch/blackfin/include/uapi/asm/Kbuild | 17 - > arch/c6x/include/uapi/asm/Kbuild | 8 - > arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - > arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - > arch/cris/include/uapi/asm/Kbuild | 43 +-- > arch/frv/include/uapi/asm/Kbuild | 33 -- > arch/h8300/include/uapi/asm/Kbuild | 28 -- > arch/hexagon/include/asm/Kbuild | 3 - > arch/hexagon/include/uapi/asm/Kbuild | 13 - > arch/ia64/include/uapi/asm/Kbuild | 45 --- > arch/m32r/include/uapi/asm/Kbuild | 31 -- > arch/m68k/include/uapi/asm/Kbuild | 24 -- > arch/metag/include/uapi/asm/Kbuild | 8 - > arch/microblaze/include/uapi/asm/Kbuild | 32 -- > arch/mips/include/uapi/asm/Kbuild | 37 --- > arch/mn10300/include/uapi/asm/Kbuild | 32 -- > arch/nios2/include/uapi/asm/Kbuild | 4 +- > arch/openrisc/include/asm/Kbuild | 3 - > arch/openrisc/include/uapi/asm/Kbuild | 8 - > arch/parisc/include/uapi/asm/Kbuild | 28 -- > arch/powerpc/include/uapi/asm/Kbuild | 45 --- > arch/s390/include/uapi/asm/Kbuild | 52 --- > arch/score/include/asm/Kbuild | 4 - > arch/score/include/uapi/asm/Kbuild | 32 -- > arch/sh/include/uapi/asm/Kbuild | 23 -- > arch/sparc/include/uapi/asm/Kbuild | 48 --- > arch/tile/include/asm/Kbuild | 3 - > arch/tile/include/uapi/arch/Kbuild | 17 - > arch/tile/include/uapi/asm/Kbuild | 19 +- > arch/unicore32/include/uapi/asm/Kbuild | 6 - > arch/x86/include/uapi/asm/Kbuild | 59 ---- > arch/xtensa/include/uapi/asm/Kbuild | 23 -- > include/Kbuild | 2 - > include/asm-generic/Kbuild.asm | 1 - > include/scsi/fc/Kbuild | 0 > include/uapi/Kbuild | 15 - > include/uapi/asm-generic/Kbuild | 36 --- > include/uapi/asm-generic/Kbuild.asm | 62 ++-- > include/uapi/drm/Kbuild | 22 -- > include/uapi/linux/Kbuild | 482 ---------------------------- > include/uapi/linux/android/Kbuild | 2 - > include/uapi/linux/byteorder/Kbuild | 3 - > include/uapi/linux/caif/Kbuild | 3 - > include/uapi/linux/can/Kbuild | 6 - > include/uapi/linux/dvb/Kbuild | 9 - > include/uapi/linux/hdlc/Kbuild | 2 - > include/uapi/linux/hsi/Kbuild | 2 - > include/uapi/linux/iio/Kbuild | 3 - > include/uapi/linux/isdn/Kbuild | 2 - > include/uapi/linux/mmc/Kbuild | 2 - > include/uapi/linux/netfilter/Kbuild | 89 ----- > include/uapi/linux/netfilter/ipset/Kbuild | 5 - > include/uapi/linux/netfilter_arp/Kbuild | 3 - > include/uapi/linux/netfilter_bridge/Kbuild | 18 -- > include/uapi/linux/netfilter_ipv4/Kbuild | 10 - > include/uapi/linux/netfilter_ipv6/Kbuild | 13 - > include/uapi/linux/nfsd/Kbuild | 6 - > include/uapi/linux/raid/Kbuild | 3 - > include/uapi/linux/spi/Kbuild | 2 - > include/uapi/linux/sunrpc/Kbuild | 2 - > include/uapi/linux/tc_act/Kbuild | 15 - > include/uapi/linux/tc_ematch/Kbuild | 5 - > include/uapi/linux/usb/Kbuild | 12 - > include/uapi/linux/wimax/Kbuild | 2 - > include/uapi/misc/Kbuild | 2 - > include/uapi/mtd/Kbuild | 6 - > include/uapi/rdma/Kbuild | 18 -- > include/uapi/rdma/hfi/Kbuild | 2 - > include/uapi/scsi/Kbuild | 6 - > include/uapi/scsi/fc/Kbuild | 5 - > include/uapi/sound/Kbuild | 16 - > include/uapi/video/Kbuild | 4 - > include/uapi/xen/Kbuild | 5 - > include/video/Kbuild | 0 > scripts/Makefile.headersinst | 39 +-- > 81 files changed, 73 insertions(+), 1745 deletions(-) > delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > delete mode 100644 arch/tile/include/uapi/arch/Kbuild > delete mode 100644 include/Kbuild > delete mode 100644 include/asm-generic/Kbuild.asm > delete mode 100644 include/scsi/fc/Kbuild > delete mode 100644 include/uapi/Kbuild > delete mode 100644 include/uapi/asm-generic/Kbuild > delete mode 100644 include/uapi/drm/Kbuild > delete mode 100644 include/uapi/linux/Kbuild > delete mode 100644 include/uapi/linux/android/Kbuild > delete mode 100644 include/uapi/linux/byteorder/Kbuild > delete mode 100644 include/uapi/linux/caif/Kbuild > delete mode 100644 include/uapi/linux/can/Kbuild > delete mode 100644 include/uapi/linux/dvb/Kbuild > delete mode 100644 include/uapi/linux/hdlc/Kbuild > delete mode 100644 include/uapi/linux/hsi/Kbuild > delete mode 100644 include/uapi/linux/iio/Kbuild > delete mode 100644 include/uapi/linux/isdn/Kbuild > delete mode 100644 include/uapi/linux/mmc/Kbuild > delete mode 100644 include/uapi/linux/netfilter/Kbuild > delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > delete mode 100644 include/uapi/linux/nfsd/Kbuild > delete mode 100644 include/uapi/linux/raid/Kbuild > delete mode 100644 include/uapi/linux/spi/Kbuild > delete mode 100644 include/uapi/linux/sunrpc/Kbuild > delete mode 100644 include/uapi/linux/tc_act/Kbuild > delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > delete mode 100644 include/uapi/linux/usb/Kbuild > delete mode 100644 include/uapi/linux/wimax/Kbuild > delete mode 100644 include/uapi/misc/Kbuild > delete mode 100644 include/uapi/mtd/Kbuild > delete mode 100644 include/uapi/rdma/Kbuild > delete mode 100644 include/uapi/rdma/hfi/Kbuild > delete mode 100644 include/uapi/scsi/Kbuild > delete mode 100644 include/uapi/scsi/fc/Kbuild > delete mode 100644 include/uapi/sound/Kbuild > delete mode 100644 include/uapi/video/Kbuild > delete mode 100644 include/uapi/xen/Kbuild > delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > --- 6.11 Post-link pass > > === 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > --- 7.2 genhdr-y > --- 7.3 generic-y > --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > that may be shared between individual architectures. > The recommended approach how to use a generic header file is > to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > > --- 6.11 Post-link pass > > @@ -1262,37 +1262,36 @@ The pre-processing does: > - drop include of compiler.h > - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > See subsequent chapter for the syntax of the Kbuild file. > > - --- 7.1 header-y > + --- 7.1 subdir-y > > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > > Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > > - The convention is to list one file per line and > + The convention is to list one subdir per line and > preferably in alphabetic order. > > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > --- 7.2 genhdr-y > > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > > Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > > --- 7.3 generic-y > > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > generic-y += bitsperlong.h > generic-y += errno.h > generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += auxvec.h > generic-y += barrier.h > generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > generic-y += sockios.h > generic-y += termbits.h > generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > generic-y += mman.h > generic-y += resource.h > generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += atomic.h > generic-y += auxvec.h > generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y += > - > - > generic-y += barrier.h > generic-y += clkdev.h > generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > # UAPI Header export list > -# User exported sparc header files > - > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > generic-y += bug.h > generic-y += bugs.h > generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > genhdr-y += unistd_32.h > genhdr-y += unistd_64.h > genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > $(if \ > $(wildcard \ > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > # ========================================================================== > # Installing headers > # > -# header-y - list files to be installed. They are preprocessed > -# to remove __KERNEL__ section of the file > -# genhdr-y - Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > # > # ========================================================================== > > # generated header directory > gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > > +# Kbuild file is optional > kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > > # called may set destination dir (when installing to asm/) > _dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > > installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > > -header-y := $(sort $(header-y)) > -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y := $(filter-out %/, $(header-y)) > +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs += $(subdir-y) > +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) > > # files used to track state of install/check > install-file := $(installdir)/.install > @@ -35,26 +39,17 @@ check-file := $(installdir)/.check > > # generic-y list all files an architecture uses from asm-generic > # Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > > srcdir := $(srctree)/$(obj) > gendir := $(objtree)/$(gen) > > # all headers files for this dir > -header-y := $(filter-out $(generic-y), $(header-y)) > -all-files := $(header-y) $(genhdr-y) $(wrapper-files) > +all-files := $(header-files) $(genhdr-files) $(wrapper-files) > output-files := $(addprefix $(installdir)/, $(all-files)) > > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > - $(if $(wildcard $(srcdir)/$(hdr)),, \ > - $(error Missing UAPI file $(srcdir)/$(hdr)) \ > - )) > -$(foreach hdr, $(genhdr-y), \ > - $(if $(wildcard $(gendir)/$(hdr)),, \ > - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ > - )) > - > # Work out what needs to be removed > oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > unwanted := $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > file$(if $(word 2, $(all-files)),s)) > cmd_install = \ > - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > for F in $(wrapper-files); do \ > echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ > done; \ > -- > 2.8.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-doc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 10:01 ` Daniel Vetter 0 siblings, 0 replies; 554+ messages in thread From: Daniel Vetter @ 2017-01-09 10:01 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-ar On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Makes lots of sense. Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > Documentation/kbuild/makefiles.txt | 41 ++- > arch/alpha/include/uapi/asm/Kbuild | 41 --- > arch/arc/include/uapi/asm/Kbuild | 3 - > arch/arm/include/uapi/asm/Kbuild | 17 - > arch/arm64/include/uapi/asm/Kbuild | 18 -- > arch/avr32/include/uapi/asm/Kbuild | 20 -- > arch/blackfin/include/uapi/asm/Kbuild | 17 - > arch/c6x/include/uapi/asm/Kbuild | 8 - > arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - > arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - > arch/cris/include/uapi/asm/Kbuild | 43 +-- > arch/frv/include/uapi/asm/Kbuild | 33 -- > arch/h8300/include/uapi/asm/Kbuild | 28 -- > arch/hexagon/include/asm/Kbuild | 3 - > arch/hexagon/include/uapi/asm/Kbuild | 13 - > arch/ia64/include/uapi/asm/Kbuild | 45 --- > arch/m32r/include/uapi/asm/Kbuild | 31 -- > arch/m68k/include/uapi/asm/Kbuild | 24 -- > arch/metag/include/uapi/asm/Kbuild | 8 - > arch/microblaze/include/uapi/asm/Kbuild | 32 -- > arch/mips/include/uapi/asm/Kbuild | 37 --- > arch/mn10300/include/uapi/asm/Kbuild | 32 -- > arch/nios2/include/uapi/asm/Kbuild | 4 +- > arch/openrisc/include/asm/Kbuild | 3 - > arch/openrisc/include/uapi/asm/Kbuild | 8 - > arch/parisc/include/uapi/asm/Kbuild | 28 -- > arch/powerpc/include/uapi/asm/Kbuild | 45 --- > arch/s390/include/uapi/asm/Kbuild | 52 --- > arch/score/include/asm/Kbuild | 4 - > arch/score/include/uapi/asm/Kbuild | 32 -- > arch/sh/include/uapi/asm/Kbuild | 23 -- > arch/sparc/include/uapi/asm/Kbuild | 48 --- > arch/tile/include/asm/Kbuild | 3 - > arch/tile/include/uapi/arch/Kbuild | 17 - > arch/tile/include/uapi/asm/Kbuild | 19 +- > arch/unicore32/include/uapi/asm/Kbuild | 6 - > arch/x86/include/uapi/asm/Kbuild | 59 ---- > arch/xtensa/include/uapi/asm/Kbuild | 23 -- > include/Kbuild | 2 - > include/asm-generic/Kbuild.asm | 1 - > include/scsi/fc/Kbuild | 0 > include/uapi/Kbuild | 15 - > include/uapi/asm-generic/Kbuild | 36 --- > include/uapi/asm-generic/Kbuild.asm | 62 ++-- > include/uapi/drm/Kbuild | 22 -- > include/uapi/linux/Kbuild | 482 ---------------------------- > include/uapi/linux/android/Kbuild | 2 - > include/uapi/linux/byteorder/Kbuild | 3 - > include/uapi/linux/caif/Kbuild | 3 - > include/uapi/linux/can/Kbuild | 6 - > include/uapi/linux/dvb/Kbuild | 9 - > include/uapi/linux/hdlc/Kbuild | 2 - > include/uapi/linux/hsi/Kbuild | 2 - > include/uapi/linux/iio/Kbuild | 3 - > include/uapi/linux/isdn/Kbuild | 2 - > include/uapi/linux/mmc/Kbuild | 2 - > include/uapi/linux/netfilter/Kbuild | 89 ----- > include/uapi/linux/netfilter/ipset/Kbuild | 5 - > include/uapi/linux/netfilter_arp/Kbuild | 3 - > include/uapi/linux/netfilter_bridge/Kbuild | 18 -- > include/uapi/linux/netfilter_ipv4/Kbuild | 10 - > include/uapi/linux/netfilter_ipv6/Kbuild | 13 - > include/uapi/linux/nfsd/Kbuild | 6 - > include/uapi/linux/raid/Kbuild | 3 - > include/uapi/linux/spi/Kbuild | 2 - > include/uapi/linux/sunrpc/Kbuild | 2 - > include/uapi/linux/tc_act/Kbuild | 15 - > include/uapi/linux/tc_ematch/Kbuild | 5 - > include/uapi/linux/usb/Kbuild | 12 - > include/uapi/linux/wimax/Kbuild | 2 - > include/uapi/misc/Kbuild | 2 - > include/uapi/mtd/Kbuild | 6 - > include/uapi/rdma/Kbuild | 18 -- > include/uapi/rdma/hfi/Kbuild | 2 - > include/uapi/scsi/Kbuild | 6 - > include/uapi/scsi/fc/Kbuild | 5 - > include/uapi/sound/Kbuild | 16 - > include/uapi/video/Kbuild | 4 - > include/uapi/xen/Kbuild | 5 - > include/video/Kbuild | 0 > scripts/Makefile.headersinst | 39 +-- > 81 files changed, 73 insertions(+), 1745 deletions(-) > delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > delete mode 100644 arch/tile/include/uapi/arch/Kbuild > delete mode 100644 include/Kbuild > delete mode 100644 include/asm-generic/Kbuild.asm > delete mode 100644 include/scsi/fc/Kbuild > delete mode 100644 include/uapi/Kbuild > delete mode 100644 include/uapi/asm-generic/Kbuild > delete mode 100644 include/uapi/drm/Kbuild > delete mode 100644 include/uapi/linux/Kbuild > delete mode 100644 include/uapi/linux/android/Kbuild > delete mode 100644 include/uapi/linux/byteorder/Kbuild > delete mode 100644 include/uapi/linux/caif/Kbuild > delete mode 100644 include/uapi/linux/can/Kbuild > delete mode 100644 include/uapi/linux/dvb/Kbuild > delete mode 100644 include/uapi/linux/hdlc/Kbuild > delete mode 100644 include/uapi/linux/hsi/Kbuild > delete mode 100644 include/uapi/linux/iio/Kbuild > delete mode 100644 include/uapi/linux/isdn/Kbuild > delete mode 100644 include/uapi/linux/mmc/Kbuild > delete mode 100644 include/uapi/linux/netfilter/Kbuild > delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > delete mode 100644 include/uapi/linux/nfsd/Kbuild > delete mode 100644 include/uapi/linux/raid/Kbuild > delete mode 100644 include/uapi/linux/spi/Kbuild > delete mode 100644 include/uapi/linux/sunrpc/Kbuild > delete mode 100644 include/uapi/linux/tc_act/Kbuild > delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > delete mode 100644 include/uapi/linux/usb/Kbuild > delete mode 100644 include/uapi/linux/wimax/Kbuild > delete mode 100644 include/uapi/misc/Kbuild > delete mode 100644 include/uapi/mtd/Kbuild > delete mode 100644 include/uapi/rdma/Kbuild > delete mode 100644 include/uapi/rdma/hfi/Kbuild > delete mode 100644 include/uapi/scsi/Kbuild > delete mode 100644 include/uapi/scsi/fc/Kbuild > delete mode 100644 include/uapi/sound/Kbuild > delete mode 100644 include/uapi/video/Kbuild > delete mode 100644 include/uapi/xen/Kbuild > delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > --- 6.11 Post-link pass > > === 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > --- 7.2 genhdr-y > --- 7.3 generic-y > --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > that may be shared between individual architectures. > The recommended approach how to use a generic header file is > to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > > --- 6.11 Post-link pass > > @@ -1262,37 +1262,36 @@ The pre-processing does: > - drop include of compiler.h > - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > See subsequent chapter for the syntax of the Kbuild file. > > - --- 7.1 header-y > + --- 7.1 subdir-y > > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > > Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > > - The convention is to list one file per line and > + The convention is to list one subdir per line and > preferably in alphabetic order. > > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > --- 7.2 genhdr-y > > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > > Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > > --- 7.3 generic-y > > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > generic-y += bitsperlong.h > generic-y += errno.h > generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += auxvec.h > generic-y += barrier.h > generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > generic-y += sockios.h > generic-y += termbits.h > generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > generic-y += mman.h > generic-y += resource.h > generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += atomic.h > generic-y += auxvec.h > generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y += > - > - > generic-y += barrier.h > generic-y += clkdev.h > generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > # UAPI Header export list > -# User exported sparc header files > - > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > generic-y += bug.h > generic-y += bugs.h > generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > genhdr-y += unistd_32.h > genhdr-y += unistd_64.h > genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > $(if \ > $(wildcard \ > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > # ========================================================================== > # Installing headers > # > -# header-y - list files to be installed. They are preprocessed > -# to remove __KERNEL__ section of the file > -# genhdr-y - Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > # > # ========================================================================== > > # generated header directory > gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > > +# Kbuild file is optional > kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > > # called may set destination dir (when installing to asm/) > _dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > > installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > > -header-y := $(sort $(header-y)) > -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y := $(filter-out %/, $(header-y)) > +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs += $(subdir-y) > +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) > > # files used to track state of install/check > install-file := $(installdir)/.install > @@ -35,26 +39,17 @@ check-file := $(installdir)/.check > > # generic-y list all files an architecture uses from asm-generic > # Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > > srcdir := $(srctree)/$(obj) > gendir := $(objtree)/$(gen) > > # all headers files for this dir > -header-y := $(filter-out $(generic-y), $(header-y)) > -all-files := $(header-y) $(genhdr-y) $(wrapper-files) > +all-files := $(header-files) $(genhdr-files) $(wrapper-files) > output-files := $(addprefix $(installdir)/, $(all-files)) > > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > - $(if $(wildcard $(srcdir)/$(hdr)),, \ > - $(error Missing UAPI file $(srcdir)/$(hdr)) \ > - )) > -$(foreach hdr, $(genhdr-y), \ > - $(if $(wildcard $(gendir)/$(hdr)),, \ > - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ > - )) > - > # Work out what needs to be removed > oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > unwanted := $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > file$(if $(word 2, $(all-files)),s)) > cmd_install = \ > - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > for F in $(wrapper-files); do \ > echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ > done; \ > -- > 2.8.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-doc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 10:01 ` Daniel Vetter 0 siblings, 0 replies; 554+ messages in thread From: Daniel Vetter @ 2017-01-09 10:01 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Makes lots of sense. Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > Documentation/kbuild/makefiles.txt | 41 ++- > arch/alpha/include/uapi/asm/Kbuild | 41 --- > arch/arc/include/uapi/asm/Kbuild | 3 - > arch/arm/include/uapi/asm/Kbuild | 17 - > arch/arm64/include/uapi/asm/Kbuild | 18 -- > arch/avr32/include/uapi/asm/Kbuild | 20 -- > arch/blackfin/include/uapi/asm/Kbuild | 17 - > arch/c6x/include/uapi/asm/Kbuild | 8 - > arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - > arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - > arch/cris/include/uapi/asm/Kbuild | 43 +-- > arch/frv/include/uapi/asm/Kbuild | 33 -- > arch/h8300/include/uapi/asm/Kbuild | 28 -- > arch/hexagon/include/asm/Kbuild | 3 - > arch/hexagon/include/uapi/asm/Kbuild | 13 - > arch/ia64/include/uapi/asm/Kbuild | 45 --- > arch/m32r/include/uapi/asm/Kbuild | 31 -- > arch/m68k/include/uapi/asm/Kbuild | 24 -- > arch/metag/include/uapi/asm/Kbuild | 8 - > arch/microblaze/include/uapi/asm/Kbuild | 32 -- > arch/mips/include/uapi/asm/Kbuild | 37 --- > arch/mn10300/include/uapi/asm/Kbuild | 32 -- > arch/nios2/include/uapi/asm/Kbuild | 4 +- > arch/openrisc/include/asm/Kbuild | 3 - > arch/openrisc/include/uapi/asm/Kbuild | 8 - > arch/parisc/include/uapi/asm/Kbuild | 28 -- > arch/powerpc/include/uapi/asm/Kbuild | 45 --- > arch/s390/include/uapi/asm/Kbuild | 52 --- > arch/score/include/asm/Kbuild | 4 - > arch/score/include/uapi/asm/Kbuild | 32 -- > arch/sh/include/uapi/asm/Kbuild | 23 -- > arch/sparc/include/uapi/asm/Kbuild | 48 --- > arch/tile/include/asm/Kbuild | 3 - > arch/tile/include/uapi/arch/Kbuild | 17 - > arch/tile/include/uapi/asm/Kbuild | 19 +- > arch/unicore32/include/uapi/asm/Kbuild | 6 - > arch/x86/include/uapi/asm/Kbuild | 59 ---- > arch/xtensa/include/uapi/asm/Kbuild | 23 -- > include/Kbuild | 2 - > include/asm-generic/Kbuild.asm | 1 - > include/scsi/fc/Kbuild | 0 > include/uapi/Kbuild | 15 - > include/uapi/asm-generic/Kbuild | 36 --- > include/uapi/asm-generic/Kbuild.asm | 62 ++-- > include/uapi/drm/Kbuild | 22 -- > include/uapi/linux/Kbuild | 482 ---------------------------- > include/uapi/linux/android/Kbuild | 2 - > include/uapi/linux/byteorder/Kbuild | 3 - > include/uapi/linux/caif/Kbuild | 3 - > include/uapi/linux/can/Kbuild | 6 - > include/uapi/linux/dvb/Kbuild | 9 - > include/uapi/linux/hdlc/Kbuild | 2 - > include/uapi/linux/hsi/Kbuild | 2 - > include/uapi/linux/iio/Kbuild | 3 - > include/uapi/linux/isdn/Kbuild | 2 - > include/uapi/linux/mmc/Kbuild | 2 - > include/uapi/linux/netfilter/Kbuild | 89 ----- > include/uapi/linux/netfilter/ipset/Kbuild | 5 - > include/uapi/linux/netfilter_arp/Kbuild | 3 - > include/uapi/linux/netfilter_bridge/Kbuild | 18 -- > include/uapi/linux/netfilter_ipv4/Kbuild | 10 - > include/uapi/linux/netfilter_ipv6/Kbuild | 13 - > include/uapi/linux/nfsd/Kbuild | 6 - > include/uapi/linux/raid/Kbuild | 3 - > include/uapi/linux/spi/Kbuild | 2 - > include/uapi/linux/sunrpc/Kbuild | 2 - > include/uapi/linux/tc_act/Kbuild | 15 - > include/uapi/linux/tc_ematch/Kbuild | 5 - > include/uapi/linux/usb/Kbuild | 12 - > include/uapi/linux/wimax/Kbuild | 2 - > include/uapi/misc/Kbuild | 2 - > include/uapi/mtd/Kbuild | 6 - > include/uapi/rdma/Kbuild | 18 -- > include/uapi/rdma/hfi/Kbuild | 2 - > include/uapi/scsi/Kbuild | 6 - > include/uapi/scsi/fc/Kbuild | 5 - > include/uapi/sound/Kbuild | 16 - > include/uapi/video/Kbuild | 4 - > include/uapi/xen/Kbuild | 5 - > include/video/Kbuild | 0 > scripts/Makefile.headersinst | 39 +-- > 81 files changed, 73 insertions(+), 1745 deletions(-) > delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > delete mode 100644 arch/tile/include/uapi/arch/Kbuild > delete mode 100644 include/Kbuild > delete mode 100644 include/asm-generic/Kbuild.asm > delete mode 100644 include/scsi/fc/Kbuild > delete mode 100644 include/uapi/Kbuild > delete mode 100644 include/uapi/asm-generic/Kbuild > delete mode 100644 include/uapi/drm/Kbuild > delete mode 100644 include/uapi/linux/Kbuild > delete mode 100644 include/uapi/linux/android/Kbuild > delete mode 100644 include/uapi/linux/byteorder/Kbuild > delete mode 100644 include/uapi/linux/caif/Kbuild > delete mode 100644 include/uapi/linux/can/Kbuild > delete mode 100644 include/uapi/linux/dvb/Kbuild > delete mode 100644 include/uapi/linux/hdlc/Kbuild > delete mode 100644 include/uapi/linux/hsi/Kbuild > delete mode 100644 include/uapi/linux/iio/Kbuild > delete mode 100644 include/uapi/linux/isdn/Kbuild > delete mode 100644 include/uapi/linux/mmc/Kbuild > delete mode 100644 include/uapi/linux/netfilter/Kbuild > delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > delete mode 100644 include/uapi/linux/nfsd/Kbuild > delete mode 100644 include/uapi/linux/raid/Kbuild > delete mode 100644 include/uapi/linux/spi/Kbuild > delete mode 100644 include/uapi/linux/sunrpc/Kbuild > delete mode 100644 include/uapi/linux/tc_act/Kbuild > delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > delete mode 100644 include/uapi/linux/usb/Kbuild > delete mode 100644 include/uapi/linux/wimax/Kbuild > delete mode 100644 include/uapi/misc/Kbuild > delete mode 100644 include/uapi/mtd/Kbuild > delete mode 100644 include/uapi/rdma/Kbuild > delete mode 100644 include/uapi/rdma/hfi/Kbuild > delete mode 100644 include/uapi/scsi/Kbuild > delete mode 100644 include/uapi/scsi/fc/Kbuild > delete mode 100644 include/uapi/sound/Kbuild > delete mode 100644 include/uapi/video/Kbuild > delete mode 100644 include/uapi/xen/Kbuild > delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > --- 6.11 Post-link pass > > === 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > --- 7.2 genhdr-y > --- 7.3 generic-y > --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > that may be shared between individual architectures. > The recommended approach how to use a generic header file is > to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > > --- 6.11 Post-link pass > > @@ -1262,37 +1262,36 @@ The pre-processing does: > - drop include of compiler.h > - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > See subsequent chapter for the syntax of the Kbuild file. > > - --- 7.1 header-y > + --- 7.1 subdir-y > > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > > Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > > - The convention is to list one file per line and > + The convention is to list one subdir per line and > preferably in alphabetic order. > > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > --- 7.2 genhdr-y > > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > > Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > > --- 7.3 generic-y > > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > generic-y += bitsperlong.h > generic-y += errno.h > generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += auxvec.h > generic-y += barrier.h > generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > generic-y += sockios.h > generic-y += termbits.h > generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > generic-y += mman.h > generic-y += resource.h > generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += atomic.h > generic-y += auxvec.h > generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y += > - > - > generic-y += barrier.h > generic-y += clkdev.h > generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > # UAPI Header export list > -# User exported sparc header files > - > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > generic-y += bug.h > generic-y += bugs.h > generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > genhdr-y += unistd_32.h > genhdr-y += unistd_64.h > genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > $(if \ > $(wildcard \ > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > # ========================================================================== > # Installing headers > # > -# header-y - list files to be installed. They are preprocessed > -# to remove __KERNEL__ section of the file > -# genhdr-y - Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > # > # ========================================================================== > > # generated header directory > gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > > +# Kbuild file is optional > kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > > # called may set destination dir (when installing to asm/) > _dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > > installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > > -header-y := $(sort $(header-y)) > -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y := $(filter-out %/, $(header-y)) > +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs += $(subdir-y) > +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) > > # files used to track state of install/check > install-file := $(installdir)/.install > @@ -35,26 +39,17 @@ check-file := $(installdir)/.check > > # generic-y list all files an architecture uses from asm-generic > # Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > > srcdir := $(srctree)/$(obj) > gendir := $(objtree)/$(gen) > > # all headers files for this dir > -header-y := $(filter-out $(generic-y), $(header-y)) > -all-files := $(header-y) $(genhdr-y) $(wrapper-files) > +all-files := $(header-files) $(genhdr-files) $(wrapper-files) > output-files := $(addprefix $(installdir)/, $(all-files)) > > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > - $(if $(wildcard $(srcdir)/$(hdr)),, \ > - $(error Missing UAPI file $(srcdir)/$(hdr)) \ > - )) > -$(foreach hdr, $(genhdr-y), \ > - $(if $(wildcard $(gendir)/$(hdr)),, \ > - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ > - )) > - > # Work out what needs to be removed > oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > unwanted := $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > file$(if $(word 2, $(all-files)),s)) > cmd_install = \ > - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > for F in $(wrapper-files); do \ > echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ > done; \ > -- > 2.8.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-doc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-06 9:43 ` Nicolas Dichtel ` (11 preceding siblings ...) (?) @ 2017-01-09 12:01 ` Russell King - ARM Linux -1 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:01 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h Acked-by: Russell King <rmk+kernel@armlinux.org.uk> -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
[parent not found: <1483695839-18660-8-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories [not found] ` <1483695839-18660-8-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> ` (5 preceding siblings ...) (?) @ 2017-01-09 12:01 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:01 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd-r2nGTMty4D4, linux-mips-6z/3iImG2C8G8FEW9MqTrA, alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw, linux-ia64-u79uwXL29TY76Z2rM5mHXA, linux-doc-u79uwXL29TY76Z2rM5mHXA, airlied-cv59FeDIM0c, linux-fbdev-u79uwXL29TY76Z2rM5mHXA, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, sparclinux-u79uwXL29TY76Z2rM5mHXA, linux-arch-u79uwXL29TY76Z2rM5mHXA, linux-s390-u79uwXL29TY76Z2rM5mHXA, linux-am33-list-H+wXaHxf7aLQT0dZR+AlfA, linux-c6x-dev-jPsnJVOj+W6hPH1hqNUYSQ, linux-rdma-u79uwXL29TY76Z2rM5mHXA, linux-hexagon-u79uwXL29TY76Z2rM5mHXA, linux-sh-u79uwXL29TY76Z2rM5mHXA, coreteam-Cap9r6Oaw4JrovVCs/uTlw, fcoe-devel-s9riP+hp16TNLxjTenLetw, xen-devel-GuqFBffKawtpuQazS67q72D2FQJk+8+b, linux-snps-arc-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-media-u79uwXL29TY76Z2rM5mHXA, uclinux-h8-devel-5NWGOfrQmneRv+LV9MX5uooqe+aC9MnS, linux-xtensa-PjhNF2WwrV/0Sa2dR60CXw, linux-kbuild-u79uwXL29TY76Z2rM5mHXA, adi-buildroot-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f, linux-raid-u79uwXL29TY76Z2rM5mHXA On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h Acked-by: Russell King <rmk+kernel@armlinux.org.uk> -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 12:01 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:01 UTC (permalink / raw) To: openrisc On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h Acked-by: Russell King <rmk+kernel@armlinux.org.uk> -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 12:01 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:01 UTC (permalink / raw) To: linux-arm-kernel On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h Acked-by: Russell King <rmk+kernel@armlinux.org.uk> -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 12:01 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:01 UTC (permalink / raw) To: linux-snps-arc On Fri, Jan 06, 2017@10:43:59AM +0100, Nicolas Dichtel wrote: > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h Acked-by: Russell King <rmk+kernel at armlinux.org.uk> -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 12:01 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:01 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm-kernel, linux-nfs, linux-parisc, linux-cris-kernel, netdev, linux-mmc, linux-kernel, linux-spi, mmarek, netfilter-devel, linux-alpha, nios2-dev, linuxppc-dev, davem On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h Acked-by: Russell King <rmk+kernel@armlinux.org.uk> -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 12:01 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:01 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm-kernel, linux-nfs, linux-parisc, linux-cris-kernel, netdev, linux-mmc, linux-kernel, linux-spi, mmarek, netfilter-devel, linux-alpha, nios2-dev, linuxppc-dev, davem On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h Acked-by: Russell King <rmk+kernel@armlinux.org.uk> -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 12:01 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:01 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd-r2nGTMty4D4, linux-mips-6z/3iImG2C8G8FEW9MqTrA, alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw, linux-ia64-u79uwXL29TY76Z2rM5mHXA, linux-doc-u79uwXL29TY76Z2rM5mHXA, airlied-cv59FeDIM0c, linux-fbdev-u79uwXL29TY76Z2rM5mHXA, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, sparclinux-u79uwXL29TY76Z2rM5mHXA, linux-arch-u79uwXL29TY76Z2rM5mHXA, linux-s390-u79uwXL29TY76Z2rM5mHXA, linux-am33-list-H+wXaHxf7aLQT0dZR+AlfA, linux-c6x-dev-jPsnJVOj+W6hPH1hqNUYSQ, linux-rdma-u79uwXL29TY76Z2rM5mHXA, linux-hexagon-u79uwXL29TY76Z2rM5mHXA, linux-sh-u79uwXL29TY76Z2rM5mHXA, coreteam-Cap9r6Oaw4JrovVCs/uTlw, fcoe-devel-s9riP+hp16TNLxjTenLetw, xen-devel-GuqFBffKawtpuQazS67q72D2FQJk+8+b, linux-snps-arc-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-media-u79uwXL29TY76Z2rM5mHXA, uclinux-h8-devel-5NWGOfrQmneRv+LV9MX5uooqe+aC9MnS, linux-xtensa-PjhNF2WwrV/0Sa2dR60CXw, linux-kbuild-u79uwXL29TY76Z2rM5mHXA, adi-buildroot-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f, linux-raid-u79uwXL29TY76Z2rM5mHXA, lin On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h Acked-by: Russell King <rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org> -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 12:01 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:01 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd-r2nGTMty4D4, linux-mips-6z/3iImG2C8G8FEW9MqTrA, alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw, linux-ia64-u79uwXL29TY76Z2rM5mHXA, linux-doc-u79uwXL29TY76Z2rM5mHXA, airlied-cv59FeDIM0c, linux-fbdev-u79uwXL29TY76Z2rM5mHXA, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, sparclinux-u79uwXL29TY76Z2rM5mHXA, linux-arch-u79uwXL29TY76Z2rM5mHXA, linux-s390-u79uwXL29TY76Z2rM5mHXA, linux-am33-list-H+wXaHxf7aLQT0dZR+AlfA, linux-c6x-dev-jPsnJVOj+W6hPH1hqNUYSQ, linux-rdma-u79uwXL29TY76Z2rM5mHXA, linux-hexagon-u79uwXL29TY76Z2rM5mHXA, linux-sh-u79uwXL29TY76Z2rM5mHXA, coreteam-Cap9r6Oaw4JrovVCs/uTlw, fcoe-devel-s9riP+hp16TNLxjTenLetw, xen-devel-GuqFBffKawtpuQazS67q72D2FQJk+8+b, linux-snps-arc-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-media-u79uwXL29TY76Z2rM5mHXA, uclinux-h8-devel-5NWGOfrQmneRv+LV9MX5uooqe+aC9MnS, linux-xtensa-PjhNF2WwrV/0Sa2dR60CXw, linux-kbuild-u79uwXL29TY76Z2rM5mHXA, adi-buildroot-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f, linux-raid-u79uwXL29TY76Z2rM5mHXA On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h Acked-by: Russell King <rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org> -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-06 9:43 ` Nicolas Dichtel ` (13 preceding siblings ...) (?) @ 2017-01-09 12:01 ` Russell King - ARM Linux -1 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-09 12:01 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h Acked-by: Russell King <rmk+kernel@armlinux.org.uk> -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-06 9:43 ` Nicolas Dichtel ` (4 preceding siblings ...) (?) @ 2017-01-09 12:56 ` Christoph Hellwig -1 siblings, 0 replies; 554+ messages in thread From: Christoph Hellwig @ 2017-01-09 12:56 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): ... snip ... > linux/genwqe/.install > linux/genwqe/..install.cmd > linux/cifs/.install > linux/cifs/..install.cmd I'm pretty sure these should not be exported! ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 12:56 ` Christoph Hellwig 0 siblings, 0 replies; 554+ messages in thread From: Christoph Hellwig @ 2017-01-09 12:56 UTC (permalink / raw) To: openrisc On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): ... snip ... > linux/genwqe/.install > linux/genwqe/..install.cmd > linux/cifs/.install > linux/cifs/..install.cmd I'm pretty sure these should not be exported! ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 12:56 ` Christoph Hellwig 0 siblings, 0 replies; 554+ messages in thread From: Christoph Hellwig @ 2017-01-09 12:56 UTC (permalink / raw) To: linux-arm-kernel On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): ... snip ... > linux/genwqe/.install > linux/genwqe/..install.cmd > linux/cifs/.install > linux/cifs/..install.cmd I'm pretty sure these should not be exported! ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 12:56 ` Christoph Hellwig 0 siblings, 0 replies; 554+ messages in thread From: Christoph Hellwig @ 2017-01-09 12:56 UTC (permalink / raw) To: linux-snps-arc On Fri, Jan 06, 2017@10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): ... snip ... > linux/genwqe/.install > linux/genwqe/..install.cmd > linux/cifs/.install > linux/cifs/..install.cmd I'm pretty sure these should not be exported! ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 12:56 ` Christoph Hellwig 0 siblings, 0 replies; 554+ messages in thread From: Christoph Hellwig @ 2017-01-09 12:56 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): ... snip ... > linux/genwqe/.install > linux/genwqe/..install.cmd > linux/cifs/.install > linux/cifs/..install.cmd I'm pretty sure these should not be exported! ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 12:56 ` Christoph Hellwig 0 siblings, 0 replies; 554+ messages in thread From: Christoph Hellwig @ 2017-01-09 12:56 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): ... snip ... > linux/genwqe/.install > linux/genwqe/..install.cmd > linux/cifs/.install > linux/cifs/..install.cmd I'm pretty sure these should not be exported! ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-09 12:56 ` Christoph Hellwig 0 siblings, 0 replies; 554+ messages in thread From: Christoph Hellwig @ 2017-01-09 12:56 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): ... snip ... > linux/genwqe/.install > linux/genwqe/..install.cmd > linux/cifs/.install > linux/cifs/..install.cmd I'm pretty sure these should not be exported! ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-09 12:56 ` Christoph Hellwig ` (5 preceding siblings ...) (?) @ 2017-01-12 15:52 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 15:52 UTC (permalink / raw) To: Christoph Hellwig Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : > On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >> Regularly, when a new header is created in include/uapi/, the developer >> forgets to add it in the corresponding Kbuild file. This error is usually >> detected after the release is out. >> >> In fact, all headers under uapi directories should be exported, thus it's >> useless to have an exhaustive list. >> >> After this patch, the following files, which were not exported, are now >> exported (with make headers_install_all): > > ... snip ... > >> linux/genwqe/.install >> linux/genwqe/..install.cmd >> linux/cifs/.install >> linux/cifs/..install.cmd > > I'm pretty sure these should not be exported! > Those files are created in every directory: $ find usr/include/ -name '\.\.install.cmd' | wc -l 71 $ find usr/include/ -name '\.install' | wc -l 71 See also http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/scripts/Makefile.headersinst#n32 Thank you, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 15:52 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 15:52 UTC (permalink / raw) To: openrisc Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : > On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >> Regularly, when a new header is created in include/uapi/, the developer >> forgets to add it in the corresponding Kbuild file. This error is usually >> detected after the release is out. >> >> In fact, all headers under uapi directories should be exported, thus it's >> useless to have an exhaustive list. >> >> After this patch, the following files, which were not exported, are now >> exported (with make headers_install_all): > > ... snip ... > >> linux/genwqe/.install >> linux/genwqe/..install.cmd >> linux/cifs/.install >> linux/cifs/..install.cmd > > I'm pretty sure these should not be exported! > Those files are created in every directory: $ find usr/include/ -name '\.\.install.cmd' | wc -l 71 $ find usr/include/ -name '\.install' | wc -l 71 See also http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/scripts/Makefile.headersinst#n32 Thank you, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 15:52 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 15:52 UTC (permalink / raw) To: linux-arm-kernel Le 09/01/2017 ? 13:56, Christoph Hellwig a ?crit : > On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >> Regularly, when a new header is created in include/uapi/, the developer >> forgets to add it in the corresponding Kbuild file. This error is usually >> detected after the release is out. >> >> In fact, all headers under uapi directories should be exported, thus it's >> useless to have an exhaustive list. >> >> After this patch, the following files, which were not exported, are now >> exported (with make headers_install_all): > > ... snip ... > >> linux/genwqe/.install >> linux/genwqe/..install.cmd >> linux/cifs/.install >> linux/cifs/..install.cmd > > I'm pretty sure these should not be exported! > Those files are created in every directory: $ find usr/include/ -name '\.\.install.cmd' | wc -l 71 $ find usr/include/ -name '\.install' | wc -l 71 See also http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/scripts/Makefile.headersinst#n32 Thank you, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 15:52 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 15:52 UTC (permalink / raw) To: linux-snps-arc Le 09/01/2017 ? 13:56, Christoph Hellwig a ?crit : > On Fri, Jan 06, 2017@10:43:59AM +0100, Nicolas Dichtel wrote: >> Regularly, when a new header is created in include/uapi/, the developer >> forgets to add it in the corresponding Kbuild file. This error is usually >> detected after the release is out. >> >> In fact, all headers under uapi directories should be exported, thus it's >> useless to have an exhaustive list. >> >> After this patch, the following files, which were not exported, are now >> exported (with make headers_install_all): > > ... snip ... > >> linux/genwqe/.install >> linux/genwqe/..install.cmd >> linux/cifs/.install >> linux/cifs/..install.cmd > > I'm pretty sure these should not be exported! > Those files are created in every directory: $ find usr/include/ -name '\.\.install.cmd' | wc -l 71 $ find usr/include/ -name '\.install' | wc -l 71 See also http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/scripts/Makefile.headersinst#n32 Thank you, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 15:52 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 15:52 UTC (permalink / raw) To: Christoph Hellwig Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : > On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >> Regularly, when a new header is created in include/uapi/, the developer >> forgets to add it in the corresponding Kbuild file. This error is usually >> detected after the release is out. >> >> In fact, all headers under uapi directories should be exported, thus it's >> useless to have an exhaustive list. >> >> After this patch, the following files, which were not exported, are now >> exported (with make headers_install_all): > > ... snip ... > >> linux/genwqe/.install >> linux/genwqe/..install.cmd >> linux/cifs/.install >> linux/cifs/..install.cmd > > I'm pretty sure these should not be exported! > Those files are created in every directory: $ find usr/include/ -name '\.\.install.cmd' | wc -l 71 $ find usr/include/ -name '\.install' | wc -l 71 See also http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/scripts/Makefile.headersinst#n32 Thank you, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 15:52 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 15:52 UTC (permalink / raw) To: Christoph Hellwig Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : > On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >> Regularly, when a new header is created in include/uapi/, the developer >> forgets to add it in the corresponding Kbuild file. This error is usually >> detected after the release is out. >> >> In fact, all headers under uapi directories should be exported, thus it's >> useless to have an exhaustive list. >> >> After this patch, the following files, which were not exported, are now >> exported (with make headers_install_all): > > ... snip ... > >> linux/genwqe/.install >> linux/genwqe/..install.cmd >> linux/cifs/.install >> linux/cifs/..install.cmd > > I'm pretty sure these should not be exported! > Those files are created in every directory: $ find usr/include/ -name '\.\.install.cmd' | wc -l 71 $ find usr/include/ -name '\.install' | wc -l 71 See also http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/scripts/Makefile.headersinst#n32 Thank you, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 15:52 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 15:52 UTC (permalink / raw) To: Christoph Hellwig Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-ar Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : > On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >> Regularly, when a new header is created in include/uapi/, the developer >> forgets to add it in the corresponding Kbuild file. This error is usually >> detected after the release is out. >> >> In fact, all headers under uapi directories should be exported, thus it's >> useless to have an exhaustive list. >> >> After this patch, the following files, which were not exported, are now >> exported (with make headers_install_all): > > ... snip ... > >> linux/genwqe/.install >> linux/genwqe/..install.cmd >> linux/cifs/.install >> linux/cifs/..install.cmd > > I'm pretty sure these should not be exported! > Those files are created in every directory: $ find usr/include/ -name '\.\.install.cmd' | wc -l 71 $ find usr/include/ -name '\.install' | wc -l 71 See also http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/scripts/Makefile.headersinst#n32 Thank you, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 15:52 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 15:52 UTC (permalink / raw) To: Christoph Hellwig Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : > On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >> Regularly, when a new header is created in include/uapi/, the developer >> forgets to add it in the corresponding Kbuild file. This error is usually >> detected after the release is out. >> >> In fact, all headers under uapi directories should be exported, thus it's >> useless to have an exhaustive list. >> >> After this patch, the following files, which were not exported, are now >> exported (with make headers_install_all): > > ... snip ... > >> linux/genwqe/.install >> linux/genwqe/..install.cmd >> linux/cifs/.install >> linux/cifs/..install.cmd > > I'm pretty sure these should not be exported! > Those files are created in every directory: $ find usr/include/ -name '\.\.install.cmd' | wc -l 71 $ find usr/include/ -name '\.install' | wc -l 71 See also http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/scripts/Makefile.headersinst#n32 Thank you, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-12 15:52 ` Nicolas Dichtel ` (6 preceding siblings ...) (?) @ 2017-01-12 16:28 ` Jan Engelhardt -1 siblings, 0 replies; 554+ messages in thread From: Jan Engelhardt @ 2017-01-12 16:28 UTC (permalink / raw) To: Nicolas Dichtel Cc: Christoph Hellwig, arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: >Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : >> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>> Regularly, when a new header is created in include/uapi/, the developer >>> forgets to add it in the corresponding Kbuild file. This error is usually >>> detected after the release is out. >>> >>> In fact, all headers under uapi directories should be exported, thus it's >>> useless to have an exhaustive list. >>> >>> After this patch, the following files, which were not exported, are now >>> exported (with make headers_install_all): >> >> ... snip ... >> >>> linux/genwqe/.install >>> linux/genwqe/..install.cmd >>> linux/cifs/.install >>> linux/cifs/..install.cmd >> >> I'm pretty sure these should not be exported! >> >Those files are created in every directory: >$ find usr/include/ -name '\.\.install.cmd' | wc -l >71 That still does not mean they should be exported. Anything but headers (and directories as a skeleton structure) is maximally suspicious. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-12 15:52 ` Nicolas Dichtel ` (5 preceding siblings ...) (?) @ 2017-01-12 16:28 ` Jan Engelhardt -1 siblings, 0 replies; 554+ messages in thread From: Jan Engelhardt @ 2017-01-12 16:28 UTC (permalink / raw) To: Nicolas Dichtel Cc: Christoph Hellwig, arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: >Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : >> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>> Regularly, when a new header is created in include/uapi/, the developer >>> forgets to add it in the corresponding Kbuild file. This error is usually >>> detected after the release is out. >>> >>> In fact, all headers under uapi directories should be exported, thus it's >>> useless to have an exhaustive list. >>> >>> After this patch, the following files, which were not exported, are now >>> exported (with make headers_install_all): >> >> ... snip ... >> >>> linux/genwqe/.install >>> linux/genwqe/..install.cmd >>> linux/cifs/.install >>> linux/cifs/..install.cmd >> >> I'm pretty sure these should not be exported! >> >Those files are created in every directory: >$ find usr/include/ -name '\.\.install.cmd' | wc -l >71 That still does not mean they should be exported. Anything but headers (and directories as a skeleton structure) is maximally suspicious. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 16:28 ` Jan Engelhardt 0 siblings, 0 replies; 554+ messages in thread From: Jan Engelhardt @ 2017-01-12 16:28 UTC (permalink / raw) To: openrisc On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: >Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : >> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>> Regularly, when a new header is created in include/uapi/, the developer >>> forgets to add it in the corresponding Kbuild file. This error is usually >>> detected after the release is out. >>> >>> In fact, all headers under uapi directories should be exported, thus it's >>> useless to have an exhaustive list. >>> >>> After this patch, the following files, which were not exported, are now >>> exported (with make headers_install_all): >> >> ... snip ... >> >>> linux/genwqe/.install >>> linux/genwqe/..install.cmd >>> linux/cifs/.install >>> linux/cifs/..install.cmd >> >> I'm pretty sure these should not be exported! >> >Those files are created in every directory: >$ find usr/include/ -name '\.\.install.cmd' | wc -l >71 That still does not mean they should be exported. Anything but headers (and directories as a skeleton structure) is maximally suspicious. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 16:28 ` Jan Engelhardt 0 siblings, 0 replies; 554+ messages in thread From: Jan Engelhardt @ 2017-01-12 16:28 UTC (permalink / raw) To: linux-arm-kernel On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: >Le 09/01/2017 ? 13:56, Christoph Hellwig a ?crit : >> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>> Regularly, when a new header is created in include/uapi/, the developer >>> forgets to add it in the corresponding Kbuild file. This error is usually >>> detected after the release is out. >>> >>> In fact, all headers under uapi directories should be exported, thus it's >>> useless to have an exhaustive list. >>> >>> After this patch, the following files, which were not exported, are now >>> exported (with make headers_install_all): >> >> ... snip ... >> >>> linux/genwqe/.install >>> linux/genwqe/..install.cmd >>> linux/cifs/.install >>> linux/cifs/..install.cmd >> >> I'm pretty sure these should not be exported! >> >Those files are created in every directory: >$ find usr/include/ -name '\.\.install.cmd' | wc -l >71 That still does not mean they should be exported. Anything but headers (and directories as a skeleton structure) is maximally suspicious. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 16:28 ` Jan Engelhardt 0 siblings, 0 replies; 554+ messages in thread From: Jan Engelhardt @ 2017-01-12 16:28 UTC (permalink / raw) To: linux-snps-arc On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: >Le 09/01/2017 ? 13:56, Christoph Hellwig a ?crit : >> On Fri, Jan 06, 2017@10:43:59AM +0100, Nicolas Dichtel wrote: >>> Regularly, when a new header is created in include/uapi/, the developer >>> forgets to add it in the corresponding Kbuild file. This error is usually >>> detected after the release is out. >>> >>> In fact, all headers under uapi directories should be exported, thus it's >>> useless to have an exhaustive list. >>> >>> After this patch, the following files, which were not exported, are now >>> exported (with make headers_install_all): >> >> ... snip ... >> >>> linux/genwqe/.install >>> linux/genwqe/..install.cmd >>> linux/cifs/.install >>> linux/cifs/..install.cmd >> >> I'm pretty sure these should not be exported! >> >Those files are created in every directory: >$ find usr/include/ -name '\.\.install.cmd' | wc -l >71 That still does not mean they should be exported. Anything but headers (and directories as a skeleton structure) is maximally suspicious. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 16:28 ` Jan Engelhardt 0 siblings, 0 replies; 554+ messages in thread From: Jan Engelhardt @ 2017-01-12 16:28 UTC (permalink / raw) To: Nicolas Dichtel Cc: Christoph Hellwig, arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: >Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : >> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>> Regularly, when a new header is created in include/uapi/, the developer >>> forgets to add it in the corresponding Kbuild file. This error is usually >>> detected after the release is out. >>> >>> In fact, all headers under uapi directories should be exported, thus it's >>> useless to have an exhaustive list. >>> >>> After this patch, the following files, which were not exported, are now >>> exported (with make headers_install_all): >> >> ... snip ... >> >>> linux/genwqe/.install >>> linux/genwqe/..install.cmd >>> linux/cifs/.install >>> linux/cifs/..install.cmd >> >> I'm pretty sure these should not be exported! >> >Those files are created in every directory: >$ find usr/include/ -name '\.\.install.cmd' | wc -l >71 That still does not mean they should be exported. Anything but headers (and directories as a skeleton structure) is maximally suspicious. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 16:28 ` Jan Engelhardt 0 siblings, 0 replies; 554+ messages in thread From: Jan Engelhardt @ 2017-01-12 16:28 UTC (permalink / raw) To: Nicolas Dichtel Cc: Christoph Hellwig, arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: >Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : >> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>> Regularly, when a new header is created in include/uapi/, the developer >>> forgets to add it in the corresponding Kbuild file. This error is usually >>> detected after the release is out. >>> >>> In fact, all headers under uapi directories should be exported, thus it's >>> useless to have an exhaustive list. >>> >>> After this patch, the following files, which were not exported, are now >>> exported (with make headers_install_all): >> >> ... snip ... >> >>> linux/genwqe/.install >>> linux/genwqe/..install.cmd >>> linux/cifs/.install >>> linux/cifs/..install.cmd >> >> I'm pretty sure these should not be exported! >> >Those files are created in every directory: >$ find usr/include/ -name '\.\.install.cmd' | wc -l >71 That still does not mean they should be exported. Anything but headers (and directories as a skeleton structure) is maximally suspicious. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 16:28 ` Jan Engelhardt 0 siblings, 0 replies; 554+ messages in thread From: Jan Engelhardt @ 2017-01-12 16:28 UTC (permalink / raw) To: Nicolas Dichtel Cc: Christoph Hellwig, arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: >Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : >> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>> Regularly, when a new header is created in include/uapi/, the developer >>> forgets to add it in the corresponding Kbuild file. This error is usually >>> detected after the release is out. >>> >>> In fact, all headers under uapi directories should be exported, thus it's >>> useless to have an exhaustive list. >>> >>> After this patch, the following files, which were not exported, are now >>> exported (with make headers_install_all): >> >> ... snip ... >> >>> linux/genwqe/.install >>> linux/genwqe/..install.cmd >>> linux/cifs/.install >>> linux/cifs/..install.cmd >> >> I'm pretty sure these should not be exported! >> >Those files are created in every directory: >$ find usr/include/ -name '\.\.install.cmd' | wc -l >71 That still does not mean they should be exported. Anything but headers (and directories as a skeleton structure) is maximally suspicious. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 16:28 ` Jan Engelhardt 0 siblings, 0 replies; 554+ messages in thread From: Jan Engelhardt @ 2017-01-12 16:28 UTC (permalink / raw) To: Nicolas Dichtel Cc: Christoph Hellwig, arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: >Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : >> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>> Regularly, when a new header is created in include/uapi/, the developer >>> forgets to add it in the corresponding Kbuild file. This error is usually >>> detected after the release is out. >>> >>> In fact, all headers under uapi directories should be exported, thus it's >>> useless to have an exhaustive list. >>> >>> After this patch, the following files, which were not exported, are now >>> exported (with make headers_install_all): >> >> ... snip ... >> >>> linux/genwqe/.install >>> linux/genwqe/..install.cmd >>> linux/cifs/.install >>> linux/cifs/..install.cmd >> >> I'm pretty sure these should not be exported! >> >Those files are created in every directory: >$ find usr/include/ -name '\.\.install.cmd' | wc -l >71 That still does not mean they should be exported. Anything but headers (and directories as a skeleton structure) is maximally suspicious. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-12 16:28 ` Jan Engelhardt ` (6 preceding siblings ...) (?) @ 2017-01-12 16:32 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 16:32 UTC (permalink / raw) To: Jan Engelhardt Cc: Christoph Hellwig, arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux Le 12/01/2017 à 17:28, Jan Engelhardt a écrit : > On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: > >> Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : >>> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>>> Regularly, when a new header is created in include/uapi/, the developer >>>> forgets to add it in the corresponding Kbuild file. This error is usually >>>> detected after the release is out. >>>> >>>> In fact, all headers under uapi directories should be exported, thus it's >>>> useless to have an exhaustive list. >>>> >>>> After this patch, the following files, which were not exported, are now >>>> exported (with make headers_install_all): >>> >>> ... snip ... >>> >>>> linux/genwqe/.install >>>> linux/genwqe/..install.cmd >>>> linux/cifs/.install >>>> linux/cifs/..install.cmd >>> >>> I'm pretty sure these should not be exported! >>> >> Those files are created in every directory: >> $ find usr/include/ -name '\.\.install.cmd' | wc -l >> 71 > > That still does not mean they should be exported. > > Anything but headers (and directories as a skeleton structure) is maximally suspicious. > What I was trying to say is that I export those directories like other are. Removing those files is not related to that series. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-12 16:28 ` Jan Engelhardt ` (7 preceding siblings ...) (?) @ 2017-01-12 16:32 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 16:32 UTC (permalink / raw) To: Jan Engelhardt Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, Christoph Hellwig, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc Le 12/01/2017 à 17:28, Jan Engelhardt a écrit : > On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: > >> Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : >>> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>>> Regularly, when a new header is created in include/uapi/, the developer >>>> forgets to add it in the corresponding Kbuild file. This error is usually >>>> detected after the release is out. >>>> >>>> In fact, all headers under uapi directories should be exported, thus it's >>>> useless to have an exhaustive list. >>>> >>>> After this patch, the following files, which were not exported, are now >>>> exported (with make headers_install_all): >>> >>> ... snip ... >>> >>>> linux/genwqe/.install >>>> linux/genwqe/..install.cmd >>>> linux/cifs/.install >>>> linux/cifs/..install.cmd >>> >>> I'm pretty sure these should not be exported! >>> >> Those files are created in every directory: >> $ find usr/include/ -name '\.\.install.cmd' | wc -l >> 71 > > That still does not mean they should be exported. > > Anything but headers (and directories as a skeleton structure) is maximally suspicious. > What I was trying to say is that I export those directories like other are. Removing those files is not related to that series. Regards, Nicolas _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-12 16:28 ` Jan Engelhardt ` (5 preceding siblings ...) (?) @ 2017-01-12 16:32 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 16:32 UTC (permalink / raw) To: Jan Engelhardt Cc: Christoph Hellwig, arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux Le 12/01/2017 à 17:28, Jan Engelhardt a écrit : > On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: > >> Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : >>> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>>> Regularly, when a new header is created in include/uapi/, the developer >>>> forgets to add it in the corresponding Kbuild file. This error is usually >>>> detected after the release is out. >>>> >>>> In fact, all headers under uapi directories should be exported, thus it's >>>> useless to have an exhaustive list. >>>> >>>> After this patch, the following files, which were not exported, are now >>>> exported (with make headers_install_all): >>> >>> ... snip ... >>> >>>> linux/genwqe/.install >>>> linux/genwqe/..install.cmd >>>> linux/cifs/.install >>>> linux/cifs/..install.cmd >>> >>> I'm pretty sure these should not be exported! >>> >> Those files are created in every directory: >> $ find usr/include/ -name '\.\.install.cmd' | wc -l >> 71 > > That still does not mean they should be exported. > > Anything but headers (and directories as a skeleton structure) is maximally suspicious. > What I was trying to say is that I export those directories like other are. Removing those files is not related to that series. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 16:32 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 16:32 UTC (permalink / raw) To: openrisc Le 12/01/2017 à 17:28, Jan Engelhardt a écrit : > On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: > >> Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : >>> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>>> Regularly, when a new header is created in include/uapi/, the developer >>>> forgets to add it in the corresponding Kbuild file. This error is usually >>>> detected after the release is out. >>>> >>>> In fact, all headers under uapi directories should be exported, thus it's >>>> useless to have an exhaustive list. >>>> >>>> After this patch, the following files, which were not exported, are now >>>> exported (with make headers_install_all): >>> >>> ... snip ... >>> >>>> linux/genwqe/.install >>>> linux/genwqe/..install.cmd >>>> linux/cifs/.install >>>> linux/cifs/..install.cmd >>> >>> I'm pretty sure these should not be exported! >>> >> Those files are created in every directory: >> $ find usr/include/ -name '\.\.install.cmd' | wc -l >> 71 > > That still does not mean they should be exported. > > Anything but headers (and directories as a skeleton structure) is maximally suspicious. > What I was trying to say is that I export those directories like other are. Removing those files is not related to that series. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 16:32 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 16:32 UTC (permalink / raw) To: linux-arm-kernel Le 12/01/2017 ? 17:28, Jan Engelhardt a ?crit : > On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: > >> Le 09/01/2017 ? 13:56, Christoph Hellwig a ?crit : >>> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>>> Regularly, when a new header is created in include/uapi/, the developer >>>> forgets to add it in the corresponding Kbuild file. This error is usually >>>> detected after the release is out. >>>> >>>> In fact, all headers under uapi directories should be exported, thus it's >>>> useless to have an exhaustive list. >>>> >>>> After this patch, the following files, which were not exported, are now >>>> exported (with make headers_install_all): >>> >>> ... snip ... >>> >>>> linux/genwqe/.install >>>> linux/genwqe/..install.cmd >>>> linux/cifs/.install >>>> linux/cifs/..install.cmd >>> >>> I'm pretty sure these should not be exported! >>> >> Those files are created in every directory: >> $ find usr/include/ -name '\.\.install.cmd' | wc -l >> 71 > > That still does not mean they should be exported. > > Anything but headers (and directories as a skeleton structure) is maximally suspicious. > What I was trying to say is that I export those directories like other are. Removing those files is not related to that series. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 16:32 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 16:32 UTC (permalink / raw) To: linux-snps-arc Le 12/01/2017 ? 17:28, Jan Engelhardt a ?crit : > On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: > >> Le 09/01/2017 ? 13:56, Christoph Hellwig a ?crit : >>> On Fri, Jan 06, 2017@10:43:59AM +0100, Nicolas Dichtel wrote: >>>> Regularly, when a new header is created in include/uapi/, the developer >>>> forgets to add it in the corresponding Kbuild file. This error is usually >>>> detected after the release is out. >>>> >>>> In fact, all headers under uapi directories should be exported, thus it's >>>> useless to have an exhaustive list. >>>> >>>> After this patch, the following files, which were not exported, are now >>>> exported (with make headers_install_all): >>> >>> ... snip ... >>> >>>> linux/genwqe/.install >>>> linux/genwqe/..install.cmd >>>> linux/cifs/.install >>>> linux/cifs/..install.cmd >>> >>> I'm pretty sure these should not be exported! >>> >> Those files are created in every directory: >> $ find usr/include/ -name '\.\.install.cmd' | wc -l >> 71 > > That still does not mean they should be exported. > > Anything but headers (and directories as a skeleton structure) is maximally suspicious. > What I was trying to say is that I export those directories like other are. Removing those files is not related to that series. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 16:32 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 16:32 UTC (permalink / raw) To: Jan Engelhardt Cc: Christoph Hellwig, arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem Le 12/01/2017 à 17:28, Jan Engelhardt a écrit : > On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: > >> Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : >>> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>>> Regularly, when a new header is created in include/uapi/, the developer >>>> forgets to add it in the corresponding Kbuild file. This error is usually >>>> detected after the release is out. >>>> >>>> In fact, all headers under uapi directories should be exported, thus it's >>>> useless to have an exhaustive list. >>>> >>>> After this patch, the following files, which were not exported, are now >>>> exported (with make headers_install_all): >>> >>> ... snip ... >>> >>>> linux/genwqe/.install >>>> linux/genwqe/..install.cmd >>>> linux/cifs/.install >>>> linux/cifs/..install.cmd >>> >>> I'm pretty sure these should not be exported! >>> >> Those files are created in every directory: >> $ find usr/include/ -name '\.\.install.cmd' | wc -l >> 71 > > That still does not mean they should be exported. > > Anything but headers (and directories as a skeleton structure) is maximally suspicious. > What I was trying to say is that I export those directories like other are. Removing those files is not related to that series. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 16:32 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 16:32 UTC (permalink / raw) To: Jan Engelhardt Cc: Christoph Hellwig, arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem Le 12/01/2017 à 17:28, Jan Engelhardt a écrit : > On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: > >> Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : >>> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>>> Regularly, when a new header is created in include/uapi/, the developer >>>> forgets to add it in the corresponding Kbuild file. This error is usually >>>> detected after the release is out. >>>> >>>> In fact, all headers under uapi directories should be exported, thus it's >>>> useless to have an exhaustive list. >>>> >>>> After this patch, the following files, which were not exported, are now >>>> exported (with make headers_install_all): >>> >>> ... snip ... >>> >>>> linux/genwqe/.install >>>> linux/genwqe/..install.cmd >>>> linux/cifs/.install >>>> linux/cifs/..install.cmd >>> >>> I'm pretty sure these should not be exported! >>> >> Those files are created in every directory: >> $ find usr/include/ -name '\.\.install.cmd' | wc -l >> 71 > > That still does not mean they should be exported. > > Anything but headers (and directories as a skeleton structure) is maximally suspicious. > What I was trying to say is that I export those directories like other are. Removing those files is not related to that series. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 16:32 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 16:32 UTC (permalink / raw) To: Jan Engelhardt Cc: Christoph Hellwig, arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux Le 12/01/2017 à 17:28, Jan Engelhardt a écrit : > On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: > >> Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : >>> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>>> Regularly, when a new header is created in include/uapi/, the developer >>>> forgets to add it in the corresponding Kbuild file. This error is usually >>>> detected after the release is out. >>>> >>>> In fact, all headers under uapi directories should be exported, thus it's >>>> useless to have an exhaustive list. >>>> >>>> After this patch, the following files, which were not exported, are now >>>> exported (with make headers_install_all): >>> >>> ... snip ... >>> >>>> linux/genwqe/.install >>>> linux/genwqe/..install.cmd >>>> linux/cifs/.install >>>> linux/cifs/..install.cmd >>> >>> I'm pretty sure these should not be exported! >>> >> Those files are created in every directory: >> $ find usr/include/ -name '\.\.install.cmd' | wc -l >> 71 > > That still does not mean they should be exported. > > Anything but headers (and directories as a skeleton structure) is maximally suspicious. > What I was trying to say is that I export those directories like other are. Removing those files is not related to that series. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-12 16:32 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 16:32 UTC (permalink / raw) To: Jan Engelhardt Cc: Christoph Hellwig, arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux Le 12/01/2017 à 17:28, Jan Engelhardt a écrit : > On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: > >> Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : >>> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>>> Regularly, when a new header is created in include/uapi/, the developer >>>> forgets to add it in the corresponding Kbuild file. This error is usually >>>> detected after the release is out. >>>> >>>> In fact, all headers under uapi directories should be exported, thus it's >>>> useless to have an exhaustive list. >>>> >>>> After this patch, the following files, which were not exported, are now >>>> exported (with make headers_install_all): >>> >>> ... snip ... >>> >>>> linux/genwqe/.install >>>> linux/genwqe/..install.cmd >>>> linux/cifs/.install >>>> linux/cifs/..install.cmd >>> >>> I'm pretty sure these should not be exported! >>> >> Those files are created in every directory: >> $ find usr/include/ -name '\.\.install.cmd' | wc -l >> 71 > > That still does not mean they should be exported. > > Anything but headers (and directories as a skeleton structure) is maximally suspicious. > What I was trying to say is that I export those directories like other are. Removing those files is not related to that series. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-12 16:32 ` Nicolas Dichtel ` (6 preceding siblings ...) (?) @ 2017-01-13 1:04 ` Jeff Epler -1 siblings, 0 replies; 554+ messages in thread From: Jeff Epler @ 2017-01-13 1:04 UTC (permalink / raw) To: Nicolas Dichtel Cc: Jan Engelhardt, Christoph Hellwig, arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh On Thu, Jan 12, 2017 at 05:32:09PM +0100, Nicolas Dichtel wrote: > What I was trying to say is that I export those directories like other are. > Removing those files is not related to that series. Perhaps the correct solution is to only copy files matching "*.h" to reduce the risk of copying files incidentally created by kbuild but which shouldn't be installed as uapi headers. jeff ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-12 16:32 ` Nicolas Dichtel ` (4 preceding siblings ...) (?) @ 2017-01-13 1:04 ` Jeff Epler -1 siblings, 0 replies; 554+ messages in thread From: Jeff Epler @ 2017-01-13 1:04 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, Christoph Hellwig, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, mmarek, linux-metag On Thu, Jan 12, 2017 at 05:32:09PM +0100, Nicolas Dichtel wrote: > What I was trying to say is that I export those directories like other are. > Removing those files is not related to that series. Perhaps the correct solution is to only copy files matching "*.h" to reduce the risk of copying files incidentally created by kbuild but which shouldn't be installed as uapi headers. jeff ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-13 1:04 ` Jeff Epler 0 siblings, 0 replies; 554+ messages in thread From: Jeff Epler @ 2017-01-13 1:04 UTC (permalink / raw) To: openrisc On Thu, Jan 12, 2017 at 05:32:09PM +0100, Nicolas Dichtel wrote: > What I was trying to say is that I export those directories like other are. > Removing those files is not related to that series. Perhaps the correct solution is to only copy files matching "*.h" to reduce the risk of copying files incidentally created by kbuild but which shouldn't be installed as uapi headers. jeff ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-13 1:04 ` Jeff Epler 0 siblings, 0 replies; 554+ messages in thread From: Jeff Epler @ 2017-01-13 1:04 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 12, 2017 at 05:32:09PM +0100, Nicolas Dichtel wrote: > What I was trying to say is that I export those directories like other are. > Removing those files is not related to that series. Perhaps the correct solution is to only copy files matching "*.h" to reduce the risk of copying files incidentally created by kbuild but which shouldn't be installed as uapi headers. jeff ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-13 1:04 ` Jeff Epler 0 siblings, 0 replies; 554+ messages in thread From: Jeff Epler @ 2017-01-13 1:04 UTC (permalink / raw) To: linux-snps-arc On Thu, Jan 12, 2017@05:32:09PM +0100, Nicolas Dichtel wrote: > What I was trying to say is that I export those directories like other are. > Removing those files is not related to that series. Perhaps the correct solution is to only copy files matching "*.h" to reduce the risk of copying files incidentally created by kbuild but which shouldn't be installed as uapi headers. jeff ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-13 1:04 ` Jeff Epler 0 siblings, 0 replies; 554+ messages in thread From: Jeff Epler @ 2017-01-13 1:04 UTC (permalink / raw) To: Nicolas Dichtel Cc: Jan Engelhardt, Christoph Hellwig, arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem On Thu, Jan 12, 2017 at 05:32:09PM +0100, Nicolas Dichtel wrote: > What I was trying to say is that I export those directories like other are. > Removing those files is not related to that series. Perhaps the correct solution is to only copy files matching "*.h" to reduce the risk of copying files incidentally created by kbuild but which shouldn't be installed as uapi headers. jeff ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-13 1:04 ` Jeff Epler 0 siblings, 0 replies; 554+ messages in thread From: Jeff Epler @ 2017-01-13 1:04 UTC (permalink / raw) To: Nicolas Dichtel Cc: Jan Engelhardt, Christoph Hellwig, arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem On Thu, Jan 12, 2017 at 05:32:09PM +0100, Nicolas Dichtel wrote: > What I was trying to say is that I export those directories like other are. > Removing those files is not related to that series. Perhaps the correct solution is to only copy files matching "*.h" to reduce the risk of copying files incidentally created by kbuild but which shouldn't be installed as uapi headers. jeff ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-13 1:04 ` Jeff Epler 0 siblings, 0 replies; 554+ messages in thread From: Jeff Epler @ 2017-01-13 1:04 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, Christoph Hellwig, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, mmarek, linux-metag On Thu, Jan 12, 2017 at 05:32:09PM +0100, Nicolas Dichtel wrote: > What I was trying to say is that I export those directories like other are. > Removing those files is not related to that series. Perhaps the correct solution is to only copy files matching "*.h" to reduce the risk of copying files incidentally created by kbuild but which shouldn't be installed as uapi headers. jeff ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-12 16:32 ` Nicolas Dichtel ` (8 preceding siblings ...) (?) @ 2017-01-13 1:04 ` Jeff Epler -1 siblings, 0 replies; 554+ messages in thread From: Jeff Epler @ 2017-01-13 1:04 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, Christoph Hellwig, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, mmarek, linux-metag On Thu, Jan 12, 2017 at 05:32:09PM +0100, Nicolas Dichtel wrote: > What I was trying to say is that I export those directories like other are. > Removing those files is not related to that series. Perhaps the correct solution is to only copy files matching "*.h" to reduce the risk of copying files incidentally created by kbuild but which shouldn't be installed as uapi headers. jeff _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-12 15:52 ` Nicolas Dichtel ` (8 preceding siblings ...) (?) @ 2017-01-12 16:28 ` Jan Engelhardt -1 siblings, 0 replies; 554+ messages in thread From: Jan Engelhardt @ 2017-01-12 16:28 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, Christoph Hellwig, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc On Thursday 2017-01-12 16:52, Nicolas Dichtel wrote: >Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : >> On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >>> Regularly, when a new header is created in include/uapi/, the developer >>> forgets to add it in the corresponding Kbuild file. This error is usually >>> detected after the release is out. >>> >>> In fact, all headers under uapi directories should be exported, thus it's >>> useless to have an exhaustive list. >>> >>> After this patch, the following files, which were not exported, are now >>> exported (with make headers_install_all): >> >> ... snip ... >> >>> linux/genwqe/.install >>> linux/genwqe/..install.cmd >>> linux/cifs/.install >>> linux/cifs/..install.cmd >> >> I'm pretty sure these should not be exported! >> >Those files are created in every directory: >$ find usr/include/ -name '\.\.install.cmd' | wc -l >71 That still does not mean they should be exported. Anything but headers (and directories as a skeleton structure) is maximally suspicious. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-09 12:56 ` Christoph Hellwig ` (6 preceding siblings ...) (?) @ 2017-01-12 15:52 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 15:52 UTC (permalink / raw) To: Christoph Hellwig Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : > On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >> Regularly, when a new header is created in include/uapi/, the developer >> forgets to add it in the corresponding Kbuild file. This error is usually >> detected after the release is out. >> >> In fact, all headers under uapi directories should be exported, thus it's >> useless to have an exhaustive list. >> >> After this patch, the following files, which were not exported, are now >> exported (with make headers_install_all): > > ... snip ... > >> linux/genwqe/.install >> linux/genwqe/..install.cmd >> linux/cifs/.install >> linux/cifs/..install.cmd > > I'm pretty sure these should not be exported! > Those files are created in every directory: $ find usr/include/ -name '\.\.install.cmd' | wc -l 71 $ find usr/include/ -name '\.install' | wc -l 71 See also http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/scripts/Makefile.headersinst#n32 Thank you, Nicolas _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-09 12:56 ` Christoph Hellwig ` (7 preceding siblings ...) (?) @ 2017-01-12 15:52 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-12 15:52 UTC (permalink / raw) To: Christoph Hellwig Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa Le 09/01/2017 à 13:56, Christoph Hellwig a écrit : > On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: >> Regularly, when a new header is created in include/uapi/, the developer >> forgets to add it in the corresponding Kbuild file. This error is usually >> detected after the release is out. >> >> In fact, all headers under uapi directories should be exported, thus it's >> useless to have an exhaustive list. >> >> After this patch, the following files, which were not exported, are now >> exported (with make headers_install_all): > > ... snip ... > >> linux/genwqe/.install >> linux/genwqe/..install.cmd >> linux/cifs/.install >> linux/cifs/..install.cmd > > I'm pretty sure these should not be exported! > Those files are created in every directory: $ find usr/include/ -name '\.\.install.cmd' | wc -l 71 $ find usr/include/ -name '\.install' | wc -l 71 See also http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/scripts/Makefile.headersinst#n32 Thank you, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-06 9:43 ` Nicolas Dichtel ` (15 preceding siblings ...) (?) @ 2017-01-09 12:56 ` Christoph Hellwig -1 siblings, 0 replies; 554+ messages in thread From: Christoph Hellwig @ 2017-01-09 12:56 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): ... snip ... > linux/genwqe/.install > linux/genwqe/..install.cmd > linux/cifs/.install > linux/cifs/..install.cmd I'm pretty sure these should not be exported! ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-06 9:43 ` Nicolas Dichtel ` (16 preceding siblings ...) (?) @ 2017-01-09 12:56 ` Christoph Hellwig -1 siblings, 0 replies; 554+ messages in thread From: Christoph Hellwig @ 2017-01-09 12:56 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm On Fri, Jan 06, 2017 at 10:43:59AM +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): ... snip ... > linux/genwqe/.install > linux/genwqe/..install.cmd > linux/cifs/.install > linux/cifs/..install.cmd I'm pretty sure these should not be exported! _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [Linux-c6x-dev] [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-06 9:43 ` Nicolas Dichtel ` (4 preceding siblings ...) (?) @ 2017-01-11 18:14 ` Mark Salter -1 siblings, 0 replies; 554+ messages in thread From: Mark Salter @ 2017-01-11 18:14 UTC (permalink / raw) To: Nicolas Dichtel, arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k On Fri, 2017-01-06 at 10:43 +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > Documentation/kbuild/makefiles.txt | 41 ++- > arch/alpha/include/uapi/asm/Kbuild | 41 --- > arch/arc/include/uapi/asm/Kbuild | 3 - > arch/arm/include/uapi/asm/Kbuild | 17 - > arch/arm64/include/uapi/asm/Kbuild | 18 -- > arch/avr32/include/uapi/asm/Kbuild | 20 -- > arch/blackfin/include/uapi/asm/Kbuild | 17 - > arch/c6x/include/uapi/asm/Kbuild | 8 - > arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - > arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - > arch/cris/include/uapi/asm/Kbuild | 43 +-- > arch/frv/include/uapi/asm/Kbuild | 33 -- > arch/h8300/include/uapi/asm/Kbuild | 28 -- > arch/hexagon/include/asm/Kbuild | 3 - > arch/hexagon/include/uapi/asm/Kbuild | 13 - > arch/ia64/include/uapi/asm/Kbuild | 45 --- > arch/m32r/include/uapi/asm/Kbuild | 31 -- > arch/m68k/include/uapi/asm/Kbuild | 24 -- > arch/metag/include/uapi/asm/Kbuild | 8 - > arch/microblaze/include/uapi/asm/Kbuild | 32 -- > arch/mips/include/uapi/asm/Kbuild | 37 --- > arch/mn10300/include/uapi/asm/Kbuild | 32 -- > arch/nios2/include/uapi/asm/Kbuild | 4 +- > arch/openrisc/include/asm/Kbuild | 3 - > arch/openrisc/include/uapi/asm/Kbuild | 8 - > arch/parisc/include/uapi/asm/Kbuild | 28 -- > arch/powerpc/include/uapi/asm/Kbuild | 45 --- > arch/s390/include/uapi/asm/Kbuild | 52 --- > arch/score/include/asm/Kbuild | 4 - > arch/score/include/uapi/asm/Kbuild | 32 -- > arch/sh/include/uapi/asm/Kbuild | 23 -- > arch/sparc/include/uapi/asm/Kbuild | 48 --- > arch/tile/include/asm/Kbuild | 3 - > arch/tile/include/uapi/arch/Kbuild | 17 - > arch/tile/include/uapi/asm/Kbuild | 19 +- > arch/unicore32/include/uapi/asm/Kbuild | 6 - > arch/x86/include/uapi/asm/Kbuild | 59 ---- > arch/xtensa/include/uapi/asm/Kbuild | 23 -- > include/Kbuild | 2 - > include/asm-generic/Kbuild.asm | 1 - > include/scsi/fc/Kbuild | 0 > include/uapi/Kbuild | 15 - > include/uapi/asm-generic/Kbuild | 36 --- > include/uapi/asm-generic/Kbuild.asm | 62 ++-- > include/uapi/drm/Kbuild | 22 -- > include/uapi/linux/Kbuild | 482 ---------------------------- > include/uapi/linux/android/Kbuild | 2 - > include/uapi/linux/byteorder/Kbuild | 3 - > include/uapi/linux/caif/Kbuild | 3 - > include/uapi/linux/can/Kbuild | 6 - > include/uapi/linux/dvb/Kbuild | 9 - > include/uapi/linux/hdlc/Kbuild | 2 - > include/uapi/linux/hsi/Kbuild | 2 - > include/uapi/linux/iio/Kbuild | 3 - > include/uapi/linux/isdn/Kbuild | 2 - > include/uapi/linux/mmc/Kbuild | 2 - > include/uapi/linux/netfilter/Kbuild | 89 ----- > include/uapi/linux/netfilter/ipset/Kbuild | 5 - > include/uapi/linux/netfilter_arp/Kbuild | 3 - > include/uapi/linux/netfilter_bridge/Kbuild | 18 -- > include/uapi/linux/netfilter_ipv4/Kbuild | 10 - > include/uapi/linux/netfilter_ipv6/Kbuild | 13 - > include/uapi/linux/nfsd/Kbuild | 6 - > include/uapi/linux/raid/Kbuild | 3 - > include/uapi/linux/spi/Kbuild | 2 - > include/uapi/linux/sunrpc/Kbuild | 2 - > include/uapi/linux/tc_act/Kbuild | 15 - > include/uapi/linux/tc_ematch/Kbuild | 5 - > include/uapi/linux/usb/Kbuild | 12 - > include/uapi/linux/wimax/Kbuild | 2 - > include/uapi/misc/Kbuild | 2 - > include/uapi/mtd/Kbuild | 6 - > include/uapi/rdma/Kbuild | 18 -- > include/uapi/rdma/hfi/Kbuild | 2 - > include/uapi/scsi/Kbuild | 6 - > include/uapi/scsi/fc/Kbuild | 5 - > include/uapi/sound/Kbuild | 16 - > include/uapi/video/Kbuild | 4 - > include/uapi/xen/Kbuild | 5 - > include/video/Kbuild | 0 > scripts/Makefile.headersinst | 39 +-- > 81 files changed, 73 insertions(+), 1745 deletions(-) > delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > delete mode 100644 arch/tile/include/uapi/arch/Kbuild > delete mode 100644 include/Kbuild > delete mode 100644 include/asm-generic/Kbuild.asm > delete mode 100644 include/scsi/fc/Kbuild > delete mode 100644 include/uapi/Kbuild > delete mode 100644 include/uapi/asm-generic/Kbuild > delete mode 100644 include/uapi/drm/Kbuild > delete mode 100644 include/uapi/linux/Kbuild > delete mode 100644 include/uapi/linux/android/Kbuild > delete mode 100644 include/uapi/linux/byteorder/Kbuild > delete mode 100644 include/uapi/linux/caif/Kbuild > delete mode 100644 include/uapi/linux/can/Kbuild > delete mode 100644 include/uapi/linux/dvb/Kbuild > delete mode 100644 include/uapi/linux/hdlc/Kbuild > delete mode 100644 include/uapi/linux/hsi/Kbuild > delete mode 100644 include/uapi/linux/iio/Kbuild > delete mode 100644 include/uapi/linux/isdn/Kbuild > delete mode 100644 include/uapi/linux/mmc/Kbuild > delete mode 100644 include/uapi/linux/netfilter/Kbuild > delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > delete mode 100644 include/uapi/linux/nfsd/Kbuild > delete mode 100644 include/uapi/linux/raid/Kbuild > delete mode 100644 include/uapi/linux/spi/Kbuild > delete mode 100644 include/uapi/linux/sunrpc/Kbuild > delete mode 100644 include/uapi/linux/tc_act/Kbuild > delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > delete mode 100644 include/uapi/linux/usb/Kbuild > delete mode 100644 include/uapi/linux/wimax/Kbuild > delete mode 100644 include/uapi/misc/Kbuild > delete mode 100644 include/uapi/mtd/Kbuild > delete mode 100644 include/uapi/rdma/Kbuild > delete mode 100644 include/uapi/rdma/hfi/Kbuild > delete mode 100644 include/uapi/scsi/Kbuild > delete mode 100644 include/uapi/scsi/fc/Kbuild > delete mode 100644 include/uapi/sound/Kbuild > delete mode 100644 include/uapi/video/Kbuild > delete mode 100644 include/uapi/xen/Kbuild > delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > --- 6.11 Post-link pass > > == 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > --- 7.2 genhdr-y > --- 7.3 generic-y > --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > that may be shared between individual architectures. > The recommended approach how to use a generic header file is > to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > > --- 6.11 Post-link pass > > @@ -1262,37 +1262,36 @@ The pre-processing does: > - drop include of compiler.h > - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > See subsequent chapter for the syntax of the Kbuild file. > > - --- 7.1 header-y > + --- 7.1 subdir-y > > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > > Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > > - The convention is to list one file per line and > + The convention is to list one subdir per line and > preferably in alphabetic order. > > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > --- 7.2 genhdr-y > > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > > Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > > --- 7.3 generic-y > > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > generic-y += bitsperlong.h > generic-y += errno.h > generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h Acked-by: Mark Salter <msalter@redhat.com> > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += auxvec.h > generic-y += barrier.h > generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > generic-y += sockios.h > generic-y += termbits.h > generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > generic-y += mman.h > generic-y += resource.h > generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += atomic.h > generic-y += auxvec.h > generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y +> - > - > generic-y += barrier.h > generic-y += clkdev.h > generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > # UAPI Header export list > -# User exported sparc header files > - > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > generic-y += bug.h > generic-y += bugs.h > generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > genhdr-y += unistd_32.h > genhdr-y += unistd_64.h > genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > $(if \ > $(wildcard \ > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > # ===================================== > # Installing headers > # > -# header-y - list files to be installed. They are preprocessed > -# to remove __KERNEL__ section of the file > -# genhdr-y - Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > # > # ===================================== > > # generated header directory > gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > > +# Kbuild file is optional > kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > > # called may set destination dir (when installing to asm/) > _dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > > installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > > -header-y := $(sort $(header-y)) > -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y := $(filter-out %/, $(header-y)) > +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs += $(subdir-y) > +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) > > # files used to track state of install/check > install-file := $(installdir)/.install > @@ -35,26 +39,17 @@ check-file := $(installdir)/.check > > # generic-y list all files an architecture uses from asm-generic > # Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > > srcdir := $(srctree)/$(obj) > gendir := $(objtree)/$(gen) > > # all headers files for this dir > -header-y := $(filter-out $(generic-y), $(header-y)) > -all-files := $(header-y) $(genhdr-y) $(wrapper-files) > +all-files := $(header-files) $(genhdr-files) $(wrapper-files) > output-files := $(addprefix $(installdir)/, $(all-files)) > > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > - $(if $(wildcard $(srcdir)/$(hdr)),, \ > - $(error Missing UAPI file $(srcdir)/$(hdr)) \ > - )) > -$(foreach hdr, $(genhdr-y), \ > - $(if $(wildcard $(gendir)/$(hdr)),, \ > - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ > - )) > - > # Work out what needs to be removed > oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > unwanted := $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > file$(if $(word 2, $(all-files)),s)) > cmd_install = \ > - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > for F in $(wrapper-files); do \ > echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ > done; \ ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [Linux-c6x-dev] [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-11 18:14 ` Mark Salter 0 siblings, 0 replies; 554+ messages in thread From: Mark Salter @ 2017-01-11 18:14 UTC (permalink / raw) To: openrisc On Fri, 2017-01-06 at 10:43 +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > Documentation/kbuild/makefiles.txt | 41 ++- > arch/alpha/include/uapi/asm/Kbuild | 41 --- > arch/arc/include/uapi/asm/Kbuild | 3 - > arch/arm/include/uapi/asm/Kbuild | 17 - > arch/arm64/include/uapi/asm/Kbuild | 18 -- > arch/avr32/include/uapi/asm/Kbuild | 20 -- > arch/blackfin/include/uapi/asm/Kbuild | 17 - > arch/c6x/include/uapi/asm/Kbuild | 8 - > arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - > arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - > arch/cris/include/uapi/asm/Kbuild | 43 +-- > arch/frv/include/uapi/asm/Kbuild | 33 -- > arch/h8300/include/uapi/asm/Kbuild | 28 -- > arch/hexagon/include/asm/Kbuild | 3 - > arch/hexagon/include/uapi/asm/Kbuild | 13 - > arch/ia64/include/uapi/asm/Kbuild | 45 --- > arch/m32r/include/uapi/asm/Kbuild | 31 -- > arch/m68k/include/uapi/asm/Kbuild | 24 -- > arch/metag/include/uapi/asm/Kbuild | 8 - > arch/microblaze/include/uapi/asm/Kbuild | 32 -- > arch/mips/include/uapi/asm/Kbuild | 37 --- > arch/mn10300/include/uapi/asm/Kbuild | 32 -- > arch/nios2/include/uapi/asm/Kbuild | 4 +- > arch/openrisc/include/asm/Kbuild | 3 - > arch/openrisc/include/uapi/asm/Kbuild | 8 - > arch/parisc/include/uapi/asm/Kbuild | 28 -- > arch/powerpc/include/uapi/asm/Kbuild | 45 --- > arch/s390/include/uapi/asm/Kbuild | 52 --- > arch/score/include/asm/Kbuild | 4 - > arch/score/include/uapi/asm/Kbuild | 32 -- > arch/sh/include/uapi/asm/Kbuild | 23 -- > arch/sparc/include/uapi/asm/Kbuild | 48 --- > arch/tile/include/asm/Kbuild | 3 - > arch/tile/include/uapi/arch/Kbuild | 17 - > arch/tile/include/uapi/asm/Kbuild | 19 +- > arch/unicore32/include/uapi/asm/Kbuild | 6 - > arch/x86/include/uapi/asm/Kbuild | 59 ---- > arch/xtensa/include/uapi/asm/Kbuild | 23 -- > include/Kbuild | 2 - > include/asm-generic/Kbuild.asm | 1 - > include/scsi/fc/Kbuild | 0 > include/uapi/Kbuild | 15 - > include/uapi/asm-generic/Kbuild | 36 --- > include/uapi/asm-generic/Kbuild.asm | 62 ++-- > include/uapi/drm/Kbuild | 22 -- > include/uapi/linux/Kbuild | 482 ---------------------------- > include/uapi/linux/android/Kbuild | 2 - > include/uapi/linux/byteorder/Kbuild | 3 - > include/uapi/linux/caif/Kbuild | 3 - > include/uapi/linux/can/Kbuild | 6 - > include/uapi/linux/dvb/Kbuild | 9 - > include/uapi/linux/hdlc/Kbuild | 2 - > include/uapi/linux/hsi/Kbuild | 2 - > include/uapi/linux/iio/Kbuild | 3 - > include/uapi/linux/isdn/Kbuild | 2 - > include/uapi/linux/mmc/Kbuild | 2 - > include/uapi/linux/netfilter/Kbuild | 89 ----- > include/uapi/linux/netfilter/ipset/Kbuild | 5 - > include/uapi/linux/netfilter_arp/Kbuild | 3 - > include/uapi/linux/netfilter_bridge/Kbuild | 18 -- > include/uapi/linux/netfilter_ipv4/Kbuild | 10 - > include/uapi/linux/netfilter_ipv6/Kbuild | 13 - > include/uapi/linux/nfsd/Kbuild | 6 - > include/uapi/linux/raid/Kbuild | 3 - > include/uapi/linux/spi/Kbuild | 2 - > include/uapi/linux/sunrpc/Kbuild | 2 - > include/uapi/linux/tc_act/Kbuild | 15 - > include/uapi/linux/tc_ematch/Kbuild | 5 - > include/uapi/linux/usb/Kbuild | 12 - > include/uapi/linux/wimax/Kbuild | 2 - > include/uapi/misc/Kbuild | 2 - > include/uapi/mtd/Kbuild | 6 - > include/uapi/rdma/Kbuild | 18 -- > include/uapi/rdma/hfi/Kbuild | 2 - > include/uapi/scsi/Kbuild | 6 - > include/uapi/scsi/fc/Kbuild | 5 - > include/uapi/sound/Kbuild | 16 - > include/uapi/video/Kbuild | 4 - > include/uapi/xen/Kbuild | 5 - > include/video/Kbuild | 0 > scripts/Makefile.headersinst | 39 +-- > 81 files changed, 73 insertions(+), 1745 deletions(-) > delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > delete mode 100644 arch/tile/include/uapi/arch/Kbuild > delete mode 100644 include/Kbuild > delete mode 100644 include/asm-generic/Kbuild.asm > delete mode 100644 include/scsi/fc/Kbuild > delete mode 100644 include/uapi/Kbuild > delete mode 100644 include/uapi/asm-generic/Kbuild > delete mode 100644 include/uapi/drm/Kbuild > delete mode 100644 include/uapi/linux/Kbuild > delete mode 100644 include/uapi/linux/android/Kbuild > delete mode 100644 include/uapi/linux/byteorder/Kbuild > delete mode 100644 include/uapi/linux/caif/Kbuild > delete mode 100644 include/uapi/linux/can/Kbuild > delete mode 100644 include/uapi/linux/dvb/Kbuild > delete mode 100644 include/uapi/linux/hdlc/Kbuild > delete mode 100644 include/uapi/linux/hsi/Kbuild > delete mode 100644 include/uapi/linux/iio/Kbuild > delete mode 100644 include/uapi/linux/isdn/Kbuild > delete mode 100644 include/uapi/linux/mmc/Kbuild > delete mode 100644 include/uapi/linux/netfilter/Kbuild > delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > delete mode 100644 include/uapi/linux/nfsd/Kbuild > delete mode 100644 include/uapi/linux/raid/Kbuild > delete mode 100644 include/uapi/linux/spi/Kbuild > delete mode 100644 include/uapi/linux/sunrpc/Kbuild > delete mode 100644 include/uapi/linux/tc_act/Kbuild > delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > delete mode 100644 include/uapi/linux/usb/Kbuild > delete mode 100644 include/uapi/linux/wimax/Kbuild > delete mode 100644 include/uapi/misc/Kbuild > delete mode 100644 include/uapi/mtd/Kbuild > delete mode 100644 include/uapi/rdma/Kbuild > delete mode 100644 include/uapi/rdma/hfi/Kbuild > delete mode 100644 include/uapi/scsi/Kbuild > delete mode 100644 include/uapi/scsi/fc/Kbuild > delete mode 100644 include/uapi/sound/Kbuild > delete mode 100644 include/uapi/video/Kbuild > delete mode 100644 include/uapi/xen/Kbuild > delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > --- 6.11 Post-link pass > > === 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > --- 7.2 genhdr-y > --- 7.3 generic-y > --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > that may be shared between individual architectures. > The recommended approach how to use a generic header file is > to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > > --- 6.11 Post-link pass > > @@ -1262,37 +1262,36 @@ The pre-processing does: > - drop include of compiler.h > - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > See subsequent chapter for the syntax of the Kbuild file. > > - --- 7.1 header-y > + --- 7.1 subdir-y > > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > > Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > > - The convention is to list one file per line and > + The convention is to list one subdir per line and > preferably in alphabetic order. > > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > --- 7.2 genhdr-y > > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > > Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > > --- 7.3 generic-y > > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > generic-y += bitsperlong.h > generic-y += errno.h > generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h Acked-by: Mark Salter <msalter@redhat.com> > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += auxvec.h > generic-y += barrier.h > generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > generic-y += sockios.h > generic-y += termbits.h > generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > generic-y += mman.h > generic-y += resource.h > generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += atomic.h > generic-y += auxvec.h > generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y += > - > - > generic-y += barrier.h > generic-y += clkdev.h > generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > # UAPI Header export list > -# User exported sparc header files > - > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > generic-y += bug.h > generic-y += bugs.h > generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > genhdr-y += unistd_32.h > genhdr-y += unistd_64.h > genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > $(if \ > $(wildcard \ > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > # ========================================================================== > # Installing headers > # > -# header-y - list files to be installed. They are preprocessed > -# to remove __KERNEL__ section of the file > -# genhdr-y - Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > # > # ========================================================================== > > # generated header directory > gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > > +# Kbuild file is optional > kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > > # called may set destination dir (when installing to asm/) > _dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > > installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > > -header-y := $(sort $(header-y)) > -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y := $(filter-out %/, $(header-y)) > +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs += $(subdir-y) > +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) > > # files used to track state of install/check > install-file := $(installdir)/.install > @@ -35,26 +39,17 @@ check-file := $(installdir)/.check > > # generic-y list all files an architecture uses from asm-generic > # Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > > srcdir := $(srctree)/$(obj) > gendir := $(objtree)/$(gen) > > # all headers files for this dir > -header-y := $(filter-out $(generic-y), $(header-y)) > -all-files := $(header-y) $(genhdr-y) $(wrapper-files) > +all-files := $(header-files) $(genhdr-files) $(wrapper-files) > output-files := $(addprefix $(installdir)/, $(all-files)) > > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > - $(if $(wildcard $(srcdir)/$(hdr)),, \ > - $(error Missing UAPI file $(srcdir)/$(hdr)) \ > - )) > -$(foreach hdr, $(genhdr-y), \ > - $(if $(wildcard $(gendir)/$(hdr)),, \ > - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ > - )) > - > # Work out what needs to be removed > oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > unwanted := $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > file$(if $(word 2, $(all-files)),s)) > cmd_install = \ > - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > for F in $(wrapper-files); do \ > echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ > done; \ ^ permalink raw reply [flat|nested] 554+ messages in thread
* [Linux-c6x-dev] [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-11 18:14 ` Mark Salter 0 siblings, 0 replies; 554+ messages in thread From: Mark Salter @ 2017-01-11 18:14 UTC (permalink / raw) To: linux-arm-kernel On Fri, 2017-01-06 at 10:43 +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > ?Documentation/kbuild/makefiles.txt??????????|??41 ++- > ?arch/alpha/include/uapi/asm/Kbuild??????????|??41 --- > ?arch/arc/include/uapi/asm/Kbuild????????????|???3 - > ?arch/arm/include/uapi/asm/Kbuild????????????|??17 - > ?arch/arm64/include/uapi/asm/Kbuild??????????|??18 -- > ?arch/avr32/include/uapi/asm/Kbuild??????????|??20 -- > ?arch/blackfin/include/uapi/asm/Kbuild???????|??17 - > ?arch/c6x/include/uapi/asm/Kbuild????????????|???8 - > ?arch/cris/include/uapi/arch-v10/arch/Kbuild |???5 - > ?arch/cris/include/uapi/arch-v32/arch/Kbuild |???3 - > ?arch/cris/include/uapi/asm/Kbuild???????????|??43 +-- > ?arch/frv/include/uapi/asm/Kbuild????????????|??33 -- > ?arch/h8300/include/uapi/asm/Kbuild??????????|??28 -- > ?arch/hexagon/include/asm/Kbuild?????????????|???3 - > ?arch/hexagon/include/uapi/asm/Kbuild????????|??13 - > ?arch/ia64/include/uapi/asm/Kbuild???????????|??45 --- > ?arch/m32r/include/uapi/asm/Kbuild???????????|??31 -- > ?arch/m68k/include/uapi/asm/Kbuild???????????|??24 -- > ?arch/metag/include/uapi/asm/Kbuild??????????|???8 - > ?arch/microblaze/include/uapi/asm/Kbuild?????|??32 -- > ?arch/mips/include/uapi/asm/Kbuild???????????|??37 --- > ?arch/mn10300/include/uapi/asm/Kbuild????????|??32 -- > ?arch/nios2/include/uapi/asm/Kbuild??????????|???4 +- > ?arch/openrisc/include/asm/Kbuild????????????|???3 - > ?arch/openrisc/include/uapi/asm/Kbuild???????|???8 - > ?arch/parisc/include/uapi/asm/Kbuild?????????|??28 -- > ?arch/powerpc/include/uapi/asm/Kbuild????????|??45 --- > ?arch/s390/include/uapi/asm/Kbuild???????????|??52 --- > ?arch/score/include/asm/Kbuild???????????????|???4 - > ?arch/score/include/uapi/asm/Kbuild??????????|??32 -- > ?arch/sh/include/uapi/asm/Kbuild?????????????|??23 -- > ?arch/sparc/include/uapi/asm/Kbuild??????????|??48 --- > ?arch/tile/include/asm/Kbuild????????????????|???3 - > ?arch/tile/include/uapi/arch/Kbuild??????????|??17 - > ?arch/tile/include/uapi/asm/Kbuild???????????|??19 +- > ?arch/unicore32/include/uapi/asm/Kbuild??????|???6 - > ?arch/x86/include/uapi/asm/Kbuild????????????|??59 ---- > ?arch/xtensa/include/uapi/asm/Kbuild?????????|??23 -- > ?include/Kbuild??????????????????????????????|???2 - > ?include/asm-generic/Kbuild.asm??????????????|???1 - > ?include/scsi/fc/Kbuild??????????????????????|???0 > ?include/uapi/Kbuild?????????????????????????|??15 - > ?include/uapi/asm-generic/Kbuild?????????????|??36 --- > ?include/uapi/asm-generic/Kbuild.asm?????????|??62 ++-- > ?include/uapi/drm/Kbuild?????????????????????|??22 -- > ?include/uapi/linux/Kbuild???????????????????| 482 ---------------------------- > ?include/uapi/linux/android/Kbuild???????????|???2 - > ?include/uapi/linux/byteorder/Kbuild?????????|???3 - > ?include/uapi/linux/caif/Kbuild??????????????|???3 - > ?include/uapi/linux/can/Kbuild???????????????|???6 - > ?include/uapi/linux/dvb/Kbuild???????????????|???9 - > ?include/uapi/linux/hdlc/Kbuild??????????????|???2 - > ?include/uapi/linux/hsi/Kbuild???????????????|???2 - > ?include/uapi/linux/iio/Kbuild???????????????|???3 - > ?include/uapi/linux/isdn/Kbuild??????????????|???2 - > ?include/uapi/linux/mmc/Kbuild???????????????|???2 - > ?include/uapi/linux/netfilter/Kbuild?????????|??89 ----- > ?include/uapi/linux/netfilter/ipset/Kbuild???|???5 - > ?include/uapi/linux/netfilter_arp/Kbuild?????|???3 - > ?include/uapi/linux/netfilter_bridge/Kbuild??|??18 -- > ?include/uapi/linux/netfilter_ipv4/Kbuild????|??10 - > ?include/uapi/linux/netfilter_ipv6/Kbuild????|??13 - > ?include/uapi/linux/nfsd/Kbuild??????????????|???6 - > ?include/uapi/linux/raid/Kbuild??????????????|???3 - > ?include/uapi/linux/spi/Kbuild???????????????|???2 - > ?include/uapi/linux/sunrpc/Kbuild????????????|???2 - > ?include/uapi/linux/tc_act/Kbuild????????????|??15 - > ?include/uapi/linux/tc_ematch/Kbuild?????????|???5 - > ?include/uapi/linux/usb/Kbuild???????????????|??12 - > ?include/uapi/linux/wimax/Kbuild?????????????|???2 - > ?include/uapi/misc/Kbuild????????????????????|???2 - > ?include/uapi/mtd/Kbuild?????????????????????|???6 - > ?include/uapi/rdma/Kbuild????????????????????|??18 -- > ?include/uapi/rdma/hfi/Kbuild????????????????|???2 - > ?include/uapi/scsi/Kbuild????????????????????|???6 - > ?include/uapi/scsi/fc/Kbuild?????????????????|???5 - > ?include/uapi/sound/Kbuild???????????????????|??16 - > ?include/uapi/video/Kbuild???????????????????|???4 - > ?include/uapi/xen/Kbuild?????????????????????|???5 - > ?include/video/Kbuild????????????????????????|???0 > ?scripts/Makefile.headersinst????????????????|??39 +-- > ?81 files changed, 73 insertions(+), 1745 deletions(-) > ?delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > ?delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > ?delete mode 100644 arch/tile/include/uapi/arch/Kbuild > ?delete mode 100644 include/Kbuild > ?delete mode 100644 include/asm-generic/Kbuild.asm > ?delete mode 100644 include/scsi/fc/Kbuild > ?delete mode 100644 include/uapi/Kbuild > ?delete mode 100644 include/uapi/asm-generic/Kbuild > ?delete mode 100644 include/uapi/drm/Kbuild > ?delete mode 100644 include/uapi/linux/Kbuild > ?delete mode 100644 include/uapi/linux/android/Kbuild > ?delete mode 100644 include/uapi/linux/byteorder/Kbuild > ?delete mode 100644 include/uapi/linux/caif/Kbuild > ?delete mode 100644 include/uapi/linux/can/Kbuild > ?delete mode 100644 include/uapi/linux/dvb/Kbuild > ?delete mode 100644 include/uapi/linux/hdlc/Kbuild > ?delete mode 100644 include/uapi/linux/hsi/Kbuild > ?delete mode 100644 include/uapi/linux/iio/Kbuild > ?delete mode 100644 include/uapi/linux/isdn/Kbuild > ?delete mode 100644 include/uapi/linux/mmc/Kbuild > ?delete mode 100644 include/uapi/linux/netfilter/Kbuild > ?delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > ?delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > ?delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > ?delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > ?delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > ?delete mode 100644 include/uapi/linux/nfsd/Kbuild > ?delete mode 100644 include/uapi/linux/raid/Kbuild > ?delete mode 100644 include/uapi/linux/spi/Kbuild > ?delete mode 100644 include/uapi/linux/sunrpc/Kbuild > ?delete mode 100644 include/uapi/linux/tc_act/Kbuild > ?delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > ?delete mode 100644 include/uapi/linux/usb/Kbuild > ?delete mode 100644 include/uapi/linux/wimax/Kbuild > ?delete mode 100644 include/uapi/misc/Kbuild > ?delete mode 100644 include/uapi/mtd/Kbuild > ?delete mode 100644 include/uapi/rdma/Kbuild > ?delete mode 100644 include/uapi/rdma/hfi/Kbuild > ?delete mode 100644 include/uapi/scsi/Kbuild > ?delete mode 100644 include/uapi/scsi/fc/Kbuild > ?delete mode 100644 include/uapi/sound/Kbuild > ?delete mode 100644 include/uapi/video/Kbuild > ?delete mode 100644 include/uapi/xen/Kbuild > ?delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > ? ???--- 6.11 Post-link pass > ? > ? === 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > ? --- 7.2 genhdr-y > ? --- 7.3 generic-y > ? --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > ? that may be shared between individual architectures. > ? The recommended approach how to use a generic header file is > ? to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > ? > ?--- 6.11 Post-link pass > ? > @@ -1262,37 +1262,36 @@ The pre-processing does: > ?- drop include of compiler.h > ?- drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > ? > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > ?See subsequent chapter for the syntax of the Kbuild file. > ? > - --- 7.1 header-y > + --- 7.1 subdir-y > ? > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > ? > ? Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > ? > - The convention is to list one file per line and > + The convention is to list one subdir per line and > ? preferably in alphabetic order. > ? > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > ? --- 7.2 genhdr-y > ? > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > ? > ? Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > ? > ? --- 7.3 generic-y > ? > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > ? > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > ?genhdr-y += unistd-common.h > ?genhdr-y += unistd-oabi.h > ?genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > ?include include/uapi/asm-generic/Kbuild.asm > ? > ?generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > ? > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > ?generic-y += bitsperlong.h > ?generic-y += errno.h > ?generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > ?include include/uapi/asm-generic/Kbuild.asm > ? > ?generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h Acked-by: Mark Salter <msalter@redhat.com> > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > ? > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > ?generic-y += auxvec.h > ?generic-y += barrier.h > ?generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > ?include include/uapi/asm-generic/Kbuild.asm > ? > ?generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > ?generic-y += sockios.h > ?generic-y += termbits.h > ?generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > ? > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > ?generic-y += mman.h > ?generic-y += resource.h > ?generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > ?include include/uapi/asm-generic/Kbuild.asm > ? > ?generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > ?include include/uapi/asm-generic/Kbuild.asm > ? > ?generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > ?generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > ?generic-y += atomic.h > ?generic-y += auxvec.h > ?generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > ?include include/uapi/asm-generic/Kbuild.asm > ? > ?generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y += > - > - > ?generic-y += barrier.h > ?generic-y += clkdev.h > ?generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > ?# UAPI Header export list > -# User exported sparc header files > - > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > ?generic-y += bug.h > ?generic-y += bugs.h > ?generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > ? > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > ?generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > ? > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > ?generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > ?genhdr-y += unistd_32.h > ?genhdr-y += unistd_64.h > ?genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > ? > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > ? ??????$(if \ > ? $(wildcard \ > ? $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - ??$(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - ??$(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - ??$(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > ?# ========================================================================== > ?# Installing headers > ?# > -# header-y??- list files to be installed. They are preprocessed > -#?????????????to remove __KERNEL__ section of the file > -# genhdr-y??- Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > ?# > ?# ========================================================================== > ? > ?# generated header directory > ?gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > ? > +# Kbuild file is optional > ?kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > ? > ?# called may set destination dir (when installing to asm/) > ?_dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > ? > ?installdir????:= $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > ? > -header-y??????:= $(sort $(header-y)) > -subdirs???????:= $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y??????:= $(filter-out %/, $(header-y)) > +subdirs???????:= $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs???????+= $(subdir-y) > +header-files??:= $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files??+= $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files??:= $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files??:= $(filter-out $(header-files), $(genhdr-files)) > ? > ?# files used to track state of install/check > ?install-file??:= $(installdir)/.install > @@ -35,26 +39,17 @@ check-file????:= $(installdir)/.check > ? > ?# generic-y list all files an architecture uses from asm-generic > ?# Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > ? > ?srcdir????????:= $(srctree)/$(obj) > ?gendir????????:= $(objtree)/$(gen) > ? > ?# all headers files for this dir > -header-y??????:= $(filter-out $(generic-y), $(header-y)) > -all-files?????:= $(header-y) $(genhdr-y) $(wrapper-files) > +all-files?????:= $(header-files) $(genhdr-files) $(wrapper-files) > ?output-files??:= $(addprefix $(installdir)/, $(all-files)) > ? > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > -??$(if $(wildcard $(srcdir)/$(hdr)),, \ > -???????$(error Missing UAPI file $(srcdir)/$(hdr)) \ > -???)) > -$(foreach hdr, $(genhdr-y), \ > -??$(if $(wildcard $(gendir)/$(hdr)),, \ > -???????$(error Missing generated UAPI file $(gendir)/$(hdr)) \ > -??)) > - > ?# Work out what needs to be removed > ?oldheaders????:= $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > ?unwanted??????:= $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > ?quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > ?????????????????????????????file$(if $(word 2, $(all-files)),s)) > ???????cmd_install = \ > -????????$(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > -????????$(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > +????????$(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > +????????$(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > ?????????for F in $(wrapper-files); do???????????????????????????????????\ > ?????????????????echo "\#include <asm-generic/$$F>" > $(installdir)/$$F;????\ > ?????????done;???????????????????????????????????????????????????????????\ ^ permalink raw reply [flat|nested] 554+ messages in thread
* [Linux-c6x-dev] [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-11 18:14 ` Mark Salter 0 siblings, 0 replies; 554+ messages in thread From: Mark Salter @ 2017-01-11 18:14 UTC (permalink / raw) To: linux-snps-arc On Fri, 2017-01-06@10:43 +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret at 6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> > --- > ?Documentation/kbuild/makefiles.txt??????????|??41 ++- > ?arch/alpha/include/uapi/asm/Kbuild??????????|??41 --- > ?arch/arc/include/uapi/asm/Kbuild????????????|???3 - > ?arch/arm/include/uapi/asm/Kbuild????????????|??17 - > ?arch/arm64/include/uapi/asm/Kbuild??????????|??18 -- > ?arch/avr32/include/uapi/asm/Kbuild??????????|??20 -- > ?arch/blackfin/include/uapi/asm/Kbuild???????|??17 - > ?arch/c6x/include/uapi/asm/Kbuild????????????|???8 - > ?arch/cris/include/uapi/arch-v10/arch/Kbuild |???5 - > ?arch/cris/include/uapi/arch-v32/arch/Kbuild |???3 - > ?arch/cris/include/uapi/asm/Kbuild???????????|??43 +-- > ?arch/frv/include/uapi/asm/Kbuild????????????|??33 -- > ?arch/h8300/include/uapi/asm/Kbuild??????????|??28 -- > ?arch/hexagon/include/asm/Kbuild?????????????|???3 - > ?arch/hexagon/include/uapi/asm/Kbuild????????|??13 - > ?arch/ia64/include/uapi/asm/Kbuild???????????|??45 --- > ?arch/m32r/include/uapi/asm/Kbuild???????????|??31 -- > ?arch/m68k/include/uapi/asm/Kbuild???????????|??24 -- > ?arch/metag/include/uapi/asm/Kbuild??????????|???8 - > ?arch/microblaze/include/uapi/asm/Kbuild?????|??32 -- > ?arch/mips/include/uapi/asm/Kbuild???????????|??37 --- > ?arch/mn10300/include/uapi/asm/Kbuild????????|??32 -- > ?arch/nios2/include/uapi/asm/Kbuild??????????|???4 +- > ?arch/openrisc/include/asm/Kbuild????????????|???3 - > ?arch/openrisc/include/uapi/asm/Kbuild???????|???8 - > ?arch/parisc/include/uapi/asm/Kbuild?????????|??28 -- > ?arch/powerpc/include/uapi/asm/Kbuild????????|??45 --- > ?arch/s390/include/uapi/asm/Kbuild???????????|??52 --- > ?arch/score/include/asm/Kbuild???????????????|???4 - > ?arch/score/include/uapi/asm/Kbuild??????????|??32 -- > ?arch/sh/include/uapi/asm/Kbuild?????????????|??23 -- > ?arch/sparc/include/uapi/asm/Kbuild??????????|??48 --- > ?arch/tile/include/asm/Kbuild????????????????|???3 - > ?arch/tile/include/uapi/arch/Kbuild??????????|??17 - > ?arch/tile/include/uapi/asm/Kbuild???????????|??19 +- > ?arch/unicore32/include/uapi/asm/Kbuild??????|???6 - > ?arch/x86/include/uapi/asm/Kbuild????????????|??59 ---- > ?arch/xtensa/include/uapi/asm/Kbuild?????????|??23 -- > ?include/Kbuild??????????????????????????????|???2 - > ?include/asm-generic/Kbuild.asm??????????????|???1 - > ?include/scsi/fc/Kbuild??????????????????????|???0 > ?include/uapi/Kbuild?????????????????????????|??15 - > ?include/uapi/asm-generic/Kbuild?????????????|??36 --- > ?include/uapi/asm-generic/Kbuild.asm?????????|??62 ++-- > ?include/uapi/drm/Kbuild?????????????????????|??22 -- > ?include/uapi/linux/Kbuild???????????????????| 482 ---------------------------- > ?include/uapi/linux/android/Kbuild???????????|???2 - > ?include/uapi/linux/byteorder/Kbuild?????????|???3 - > ?include/uapi/linux/caif/Kbuild??????????????|???3 - > ?include/uapi/linux/can/Kbuild???????????????|???6 - > ?include/uapi/linux/dvb/Kbuild???????????????|???9 - > ?include/uapi/linux/hdlc/Kbuild??????????????|???2 - > ?include/uapi/linux/hsi/Kbuild???????????????|???2 - > ?include/uapi/linux/iio/Kbuild???????????????|???3 - > ?include/uapi/linux/isdn/Kbuild??????????????|???2 - > ?include/uapi/linux/mmc/Kbuild???????????????|???2 - > ?include/uapi/linux/netfilter/Kbuild?????????|??89 ----- > ?include/uapi/linux/netfilter/ipset/Kbuild???|???5 - > ?include/uapi/linux/netfilter_arp/Kbuild?????|???3 - > ?include/uapi/linux/netfilter_bridge/Kbuild??|??18 -- > ?include/uapi/linux/netfilter_ipv4/Kbuild????|??10 - > ?include/uapi/linux/netfilter_ipv6/Kbuild????|??13 - > ?include/uapi/linux/nfsd/Kbuild??????????????|???6 - > ?include/uapi/linux/raid/Kbuild??????????????|???3 - > ?include/uapi/linux/spi/Kbuild???????????????|???2 - > ?include/uapi/linux/sunrpc/Kbuild????????????|???2 - > ?include/uapi/linux/tc_act/Kbuild????????????|??15 - > ?include/uapi/linux/tc_ematch/Kbuild?????????|???5 - > ?include/uapi/linux/usb/Kbuild???????????????|??12 - > ?include/uapi/linux/wimax/Kbuild?????????????|???2 - > ?include/uapi/misc/Kbuild????????????????????|???2 - > ?include/uapi/mtd/Kbuild?????????????????????|???6 - > ?include/uapi/rdma/Kbuild????????????????????|??18 -- > ?include/uapi/rdma/hfi/Kbuild????????????????|???2 - > ?include/uapi/scsi/Kbuild????????????????????|???6 - > ?include/uapi/scsi/fc/Kbuild?????????????????|???5 - > ?include/uapi/sound/Kbuild???????????????????|??16 - > ?include/uapi/video/Kbuild???????????????????|???4 - > ?include/uapi/xen/Kbuild?????????????????????|???5 - > ?include/video/Kbuild????????????????????????|???0 > ?scripts/Makefile.headersinst????????????????|??39 +-- > ?81 files changed, 73 insertions(+), 1745 deletions(-) > ?delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > ?delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > ?delete mode 100644 arch/tile/include/uapi/arch/Kbuild > ?delete mode 100644 include/Kbuild > ?delete mode 100644 include/asm-generic/Kbuild.asm > ?delete mode 100644 include/scsi/fc/Kbuild > ?delete mode 100644 include/uapi/Kbuild > ?delete mode 100644 include/uapi/asm-generic/Kbuild > ?delete mode 100644 include/uapi/drm/Kbuild > ?delete mode 100644 include/uapi/linux/Kbuild > ?delete mode 100644 include/uapi/linux/android/Kbuild > ?delete mode 100644 include/uapi/linux/byteorder/Kbuild > ?delete mode 100644 include/uapi/linux/caif/Kbuild > ?delete mode 100644 include/uapi/linux/can/Kbuild > ?delete mode 100644 include/uapi/linux/dvb/Kbuild > ?delete mode 100644 include/uapi/linux/hdlc/Kbuild > ?delete mode 100644 include/uapi/linux/hsi/Kbuild > ?delete mode 100644 include/uapi/linux/iio/Kbuild > ?delete mode 100644 include/uapi/linux/isdn/Kbuild > ?delete mode 100644 include/uapi/linux/mmc/Kbuild > ?delete mode 100644 include/uapi/linux/netfilter/Kbuild > ?delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > ?delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > ?delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > ?delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > ?delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > ?delete mode 100644 include/uapi/linux/nfsd/Kbuild > ?delete mode 100644 include/uapi/linux/raid/Kbuild > ?delete mode 100644 include/uapi/linux/spi/Kbuild > ?delete mode 100644 include/uapi/linux/sunrpc/Kbuild > ?delete mode 100644 include/uapi/linux/tc_act/Kbuild > ?delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > ?delete mode 100644 include/uapi/linux/usb/Kbuild > ?delete mode 100644 include/uapi/linux/wimax/Kbuild > ?delete mode 100644 include/uapi/misc/Kbuild > ?delete mode 100644 include/uapi/mtd/Kbuild > ?delete mode 100644 include/uapi/rdma/Kbuild > ?delete mode 100644 include/uapi/rdma/hfi/Kbuild > ?delete mode 100644 include/uapi/scsi/Kbuild > ?delete mode 100644 include/uapi/scsi/fc/Kbuild > ?delete mode 100644 include/uapi/sound/Kbuild > ?delete mode 100644 include/uapi/video/Kbuild > ?delete mode 100644 include/uapi/xen/Kbuild > ?delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > ? ???--- 6.11 Post-link pass > ? > ? === 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > ? --- 7.2 genhdr-y > ? --- 7.3 generic-y > ? --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > ? that may be shared between individual architectures. > ? The recommended approach how to use a generic header file is > ? to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > ? > ?--- 6.11 Post-link pass > ? > @@ -1262,37 +1262,36 @@ The pre-processing does: > ?- drop include of compiler.h > ?- drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > ? > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > ?See subsequent chapter for the syntax of the Kbuild file. > ? > - --- 7.1 header-y > + --- 7.1 subdir-y > ? > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > ? > ? Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > ? > - The convention is to list one file per line and > + The convention is to list one subdir per line and > ? preferably in alphabetic order. > ? > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > ? --- 7.2 genhdr-y > ? > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > ? > ? Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > ? > ? --- 7.3 generic-y > ? > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > ? > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > ?genhdr-y += unistd-common.h > ?genhdr-y += unistd-oabi.h > ?genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > ?include include/uapi/asm-generic/Kbuild.asm > ? > ?generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > ? > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > ?generic-y += bitsperlong.h > ?generic-y += errno.h > ?generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > ?include include/uapi/asm-generic/Kbuild.asm > ? > ?generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h Acked-by: Mark Salter <msalter at redhat.com> > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > ? > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > ?generic-y += auxvec.h > ?generic-y += barrier.h > ?generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > ?include include/uapi/asm-generic/Kbuild.asm > ? > ?generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > ?generic-y += sockios.h > ?generic-y += termbits.h > ?generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > ? > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > ?generic-y += mman.h > ?generic-y += resource.h > ?generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > ?include include/uapi/asm-generic/Kbuild.asm > ? > ?generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > ?include include/uapi/asm-generic/Kbuild.asm > ? > ?generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > ?generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > ?generic-y += atomic.h > ?generic-y += auxvec.h > ?generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > ?include include/uapi/asm-generic/Kbuild.asm > ? > ?generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y += > - > - > ?generic-y += barrier.h > ?generic-y += clkdev.h > ?generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > ?# UAPI Header export list > -# User exported sparc header files > - > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > ?generic-y += bug.h > ?generic-y += bugs.h > ?generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > ? > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > ?generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > ? > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > ?generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > ?genhdr-y += unistd_32.h > ?genhdr-y += unistd_64.h > ?genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > ?# UAPI Header export list > ?include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > ? > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > ? ??????$(if \ > ? $(wildcard \ > ? $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - ??$(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - ??$(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - ??$(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > ?# ========================================================================== > ?# Installing headers > ?# > -# header-y??- list files to be installed. They are preprocessed > -#?????????????to remove __KERNEL__ section of the file > -# genhdr-y??- Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > ?# > ?# ========================================================================== > ? > ?# generated header directory > ?gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > ? > +# Kbuild file is optional > ?kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > ? > ?# called may set destination dir (when installing to asm/) > ?_dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > ? > ?installdir????:= $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > ? > -header-y??????:= $(sort $(header-y)) > -subdirs???????:= $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y??????:= $(filter-out %/, $(header-y)) > +subdirs???????:= $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs???????+= $(subdir-y) > +header-files??:= $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files??+= $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files??:= $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files??:= $(filter-out $(header-files), $(genhdr-files)) > ? > ?# files used to track state of install/check > ?install-file??:= $(installdir)/.install > @@ -35,26 +39,17 @@ check-file????:= $(installdir)/.check > ? > ?# generic-y list all files an architecture uses from asm-generic > ?# Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > ? > ?srcdir????????:= $(srctree)/$(obj) > ?gendir????????:= $(objtree)/$(gen) > ? > ?# all headers files for this dir > -header-y??????:= $(filter-out $(generic-y), $(header-y)) > -all-files?????:= $(header-y) $(genhdr-y) $(wrapper-files) > +all-files?????:= $(header-files) $(genhdr-files) $(wrapper-files) > ?output-files??:= $(addprefix $(installdir)/, $(all-files)) > ? > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > -??$(if $(wildcard $(srcdir)/$(hdr)),, \ > -???????$(error Missing UAPI file $(srcdir)/$(hdr)) \ > -???)) > -$(foreach hdr, $(genhdr-y), \ > -??$(if $(wildcard $(gendir)/$(hdr)),, \ > -???????$(error Missing generated UAPI file $(gendir)/$(hdr)) \ > -??)) > - > ?# Work out what needs to be removed > ?oldheaders????:= $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > ?unwanted??????:= $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > ?quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > ?????????????????????????????file$(if $(word 2, $(all-files)),s)) > ???????cmd_install = \ > -????????$(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > -????????$(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > +????????$(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > +????????$(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > ?????????for F in $(wrapper-files); do???????????????????????????????????\ > ?????????????????echo "\#include <asm-generic/$$F>" > $(installdir)/$$F;????\ > ?????????done;???????????????????????????????????????????????????????????\ ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [Linux-c6x-dev] [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-11 18:14 ` Mark Salter 0 siblings, 0 replies; 554+ messages in thread From: Mark Salter @ 2017-01-11 18:14 UTC (permalink / raw) To: Nicolas Dichtel, arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm-kernel, linux-nfs, linux-parisc, linux-cris-kernel, netdev, linux-mmc, linux-kernel, linux-spi, mmarek, netfilter-devel, linux-alpha, nios2-dev, linuxppc-dev, davem On Fri, 2017-01-06 at 10:43 +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > Documentation/kbuild/makefiles.txt | 41 ++- > arch/alpha/include/uapi/asm/Kbuild | 41 --- > arch/arc/include/uapi/asm/Kbuild | 3 - > arch/arm/include/uapi/asm/Kbuild | 17 - > arch/arm64/include/uapi/asm/Kbuild | 18 -- > arch/avr32/include/uapi/asm/Kbuild | 20 -- > arch/blackfin/include/uapi/asm/Kbuild | 17 - > arch/c6x/include/uapi/asm/Kbuild | 8 - > arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - > arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - > arch/cris/include/uapi/asm/Kbuild | 43 +-- > arch/frv/include/uapi/asm/Kbuild | 33 -- > arch/h8300/include/uapi/asm/Kbuild | 28 -- > arch/hexagon/include/asm/Kbuild | 3 - > arch/hexagon/include/uapi/asm/Kbuild | 13 - > arch/ia64/include/uapi/asm/Kbuild | 45 --- > arch/m32r/include/uapi/asm/Kbuild | 31 -- > arch/m68k/include/uapi/asm/Kbuild | 24 -- > arch/metag/include/uapi/asm/Kbuild | 8 - > arch/microblaze/include/uapi/asm/Kbuild | 32 -- > arch/mips/include/uapi/asm/Kbuild | 37 --- > arch/mn10300/include/uapi/asm/Kbuild | 32 -- > arch/nios2/include/uapi/asm/Kbuild | 4 +- > arch/openrisc/include/asm/Kbuild | 3 - > arch/openrisc/include/uapi/asm/Kbuild | 8 - > arch/parisc/include/uapi/asm/Kbuild | 28 -- > arch/powerpc/include/uapi/asm/Kbuild | 45 --- > arch/s390/include/uapi/asm/Kbuild | 52 --- > arch/score/include/asm/Kbuild | 4 - > arch/score/include/uapi/asm/Kbuild | 32 -- > arch/sh/include/uapi/asm/Kbuild | 23 -- > arch/sparc/include/uapi/asm/Kbuild | 48 --- > arch/tile/include/asm/Kbuild | 3 - > arch/tile/include/uapi/arch/Kbuild | 17 - > arch/tile/include/uapi/asm/Kbuild | 19 +- > arch/unicore32/include/uapi/asm/Kbuild | 6 - > arch/x86/include/uapi/asm/Kbuild | 59 ---- > arch/xtensa/include/uapi/asm/Kbuild | 23 -- > include/Kbuild | 2 - > include/asm-generic/Kbuild.asm | 1 - > include/scsi/fc/Kbuild | 0 > include/uapi/Kbuild | 15 - > include/uapi/asm-generic/Kbuild | 36 --- > include/uapi/asm-generic/Kbuild.asm | 62 ++-- > include/uapi/drm/Kbuild | 22 -- > include/uapi/linux/Kbuild | 482 ---------------------------- > include/uapi/linux/android/Kbuild | 2 - > include/uapi/linux/byteorder/Kbuild | 3 - > include/uapi/linux/caif/Kbuild | 3 - > include/uapi/linux/can/Kbuild | 6 - > include/uapi/linux/dvb/Kbuild | 9 - > include/uapi/linux/hdlc/Kbuild | 2 - > include/uapi/linux/hsi/Kbuild | 2 - > include/uapi/linux/iio/Kbuild | 3 - > include/uapi/linux/isdn/Kbuild | 2 - > include/uapi/linux/mmc/Kbuild | 2 - > include/uapi/linux/netfilter/Kbuild | 89 ----- > include/uapi/linux/netfilter/ipset/Kbuild | 5 - > include/uapi/linux/netfilter_arp/Kbuild | 3 - > include/uapi/linux/netfilter_bridge/Kbuild | 18 -- > include/uapi/linux/netfilter_ipv4/Kbuild | 10 - > include/uapi/linux/netfilter_ipv6/Kbuild | 13 - > include/uapi/linux/nfsd/Kbuild | 6 - > include/uapi/linux/raid/Kbuild | 3 - > include/uapi/linux/spi/Kbuild | 2 - > include/uapi/linux/sunrpc/Kbuild | 2 - > include/uapi/linux/tc_act/Kbuild | 15 - > include/uapi/linux/tc_ematch/Kbuild | 5 - > include/uapi/linux/usb/Kbuild | 12 - > include/uapi/linux/wimax/Kbuild | 2 - > include/uapi/misc/Kbuild | 2 - > include/uapi/mtd/Kbuild | 6 - > include/uapi/rdma/Kbuild | 18 -- > include/uapi/rdma/hfi/Kbuild | 2 - > include/uapi/scsi/Kbuild | 6 - > include/uapi/scsi/fc/Kbuild | 5 - > include/uapi/sound/Kbuild | 16 - > include/uapi/video/Kbuild | 4 - > include/uapi/xen/Kbuild | 5 - > include/video/Kbuild | 0 > scripts/Makefile.headersinst | 39 +-- > 81 files changed, 73 insertions(+), 1745 deletions(-) > delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > delete mode 100644 arch/tile/include/uapi/arch/Kbuild > delete mode 100644 include/Kbuild > delete mode 100644 include/asm-generic/Kbuild.asm > delete mode 100644 include/scsi/fc/Kbuild > delete mode 100644 include/uapi/Kbuild > delete mode 100644 include/uapi/asm-generic/Kbuild > delete mode 100644 include/uapi/drm/Kbuild > delete mode 100644 include/uapi/linux/Kbuild > delete mode 100644 include/uapi/linux/android/Kbuild > delete mode 100644 include/uapi/linux/byteorder/Kbuild > delete mode 100644 include/uapi/linux/caif/Kbuild > delete mode 100644 include/uapi/linux/can/Kbuild > delete mode 100644 include/uapi/linux/dvb/Kbuild > delete mode 100644 include/uapi/linux/hdlc/Kbuild > delete mode 100644 include/uapi/linux/hsi/Kbuild > delete mode 100644 include/uapi/linux/iio/Kbuild > delete mode 100644 include/uapi/linux/isdn/Kbuild > delete mode 100644 include/uapi/linux/mmc/Kbuild > delete mode 100644 include/uapi/linux/netfilter/Kbuild > delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > delete mode 100644 include/uapi/linux/nfsd/Kbuild > delete mode 100644 include/uapi/linux/raid/Kbuild > delete mode 100644 include/uapi/linux/spi/Kbuild > delete mode 100644 include/uapi/linux/sunrpc/Kbuild > delete mode 100644 include/uapi/linux/tc_act/Kbuild > delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > delete mode 100644 include/uapi/linux/usb/Kbuild > delete mode 100644 include/uapi/linux/wimax/Kbuild > delete mode 100644 include/uapi/misc/Kbuild > delete mode 100644 include/uapi/mtd/Kbuild > delete mode 100644 include/uapi/rdma/Kbuild > delete mode 100644 include/uapi/rdma/hfi/Kbuild > delete mode 100644 include/uapi/scsi/Kbuild > delete mode 100644 include/uapi/scsi/fc/Kbuild > delete mode 100644 include/uapi/sound/Kbuild > delete mode 100644 include/uapi/video/Kbuild > delete mode 100644 include/uapi/xen/Kbuild > delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > --- 6.11 Post-link pass > > === 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > --- 7.2 genhdr-y > --- 7.3 generic-y > --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > that may be shared between individual architectures. > The recommended approach how to use a generic header file is > to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > > --- 6.11 Post-link pass > > @@ -1262,37 +1262,36 @@ The pre-processing does: > - drop include of compiler.h > - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > See subsequent chapter for the syntax of the Kbuild file. > > - --- 7.1 header-y > + --- 7.1 subdir-y > > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > > Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > > - The convention is to list one file per line and > + The convention is to list one subdir per line and > preferably in alphabetic order. > > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > --- 7.2 genhdr-y > > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > > Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > > --- 7.3 generic-y > > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > generic-y += bitsperlong.h > generic-y += errno.h > generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h Acked-by: Mark Salter <msalter@redhat.com> > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += auxvec.h > generic-y += barrier.h > generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > generic-y += sockios.h > generic-y += termbits.h > generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > generic-y += mman.h > generic-y += resource.h > generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += atomic.h > generic-y += auxvec.h > generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y += > - > - > generic-y += barrier.h > generic-y += clkdev.h > generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > # UAPI Header export list > -# User exported sparc header files > - > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > generic-y += bug.h > generic-y += bugs.h > generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > genhdr-y += unistd_32.h > genhdr-y += unistd_64.h > genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > $(if \ > $(wildcard \ > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > # ========================================================================== > # Installing headers > # > -# header-y - list files to be installed. They are preprocessed > -# to remove __KERNEL__ section of the file > -# genhdr-y - Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > # > # ========================================================================== > > # generated header directory > gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > > +# Kbuild file is optional > kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > > # called may set destination dir (when installing to asm/) > _dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > > installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > > -header-y := $(sort $(header-y)) > -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y := $(filter-out %/, $(header-y)) > +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs += $(subdir-y) > +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) > > # files used to track state of install/check > install-file := $(installdir)/.install > @@ -35,26 +39,17 @@ check-file := $(installdir)/.check > > # generic-y list all files an architecture uses from asm-generic > # Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > > srcdir := $(srctree)/$(obj) > gendir := $(objtree)/$(gen) > > # all headers files for this dir > -header-y := $(filter-out $(generic-y), $(header-y)) > -all-files := $(header-y) $(genhdr-y) $(wrapper-files) > +all-files := $(header-files) $(genhdr-files) $(wrapper-files) > output-files := $(addprefix $(installdir)/, $(all-files)) > > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > - $(if $(wildcard $(srcdir)/$(hdr)),, \ > - $(error Missing UAPI file $(srcdir)/$(hdr)) \ > - )) > -$(foreach hdr, $(genhdr-y), \ > - $(if $(wildcard $(gendir)/$(hdr)),, \ > - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ > - )) > - > # Work out what needs to be removed > oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > unwanted := $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > file$(if $(word 2, $(all-files)),s)) > cmd_install = \ > - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > for F in $(wrapper-files); do \ > echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ > done; \ ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [Linux-c6x-dev] [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-11 18:14 ` Mark Salter 0 siblings, 0 replies; 554+ messages in thread From: Mark Salter @ 2017-01-11 18:14 UTC (permalink / raw) To: Nicolas Dichtel, arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm-kernel, linux-nfs, linux-parisc, linux-cris-kernel, netdev, linux-mmc, linux-kernel, linux-spi, mmarek, netfilter-devel, linux-alpha, nios2-dev, linuxppc-dev, davem On Fri, 2017-01-06 at 10:43 +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > Documentation/kbuild/makefiles.txt | 41 ++- > arch/alpha/include/uapi/asm/Kbuild | 41 --- > arch/arc/include/uapi/asm/Kbuild | 3 - > arch/arm/include/uapi/asm/Kbuild | 17 - > arch/arm64/include/uapi/asm/Kbuild | 18 -- > arch/avr32/include/uapi/asm/Kbuild | 20 -- > arch/blackfin/include/uapi/asm/Kbuild | 17 - > arch/c6x/include/uapi/asm/Kbuild | 8 - > arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - > arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - > arch/cris/include/uapi/asm/Kbuild | 43 +-- > arch/frv/include/uapi/asm/Kbuild | 33 -- > arch/h8300/include/uapi/asm/Kbuild | 28 -- > arch/hexagon/include/asm/Kbuild | 3 - > arch/hexagon/include/uapi/asm/Kbuild | 13 - > arch/ia64/include/uapi/asm/Kbuild | 45 --- > arch/m32r/include/uapi/asm/Kbuild | 31 -- > arch/m68k/include/uapi/asm/Kbuild | 24 -- > arch/metag/include/uapi/asm/Kbuild | 8 - > arch/microblaze/include/uapi/asm/Kbuild | 32 -- > arch/mips/include/uapi/asm/Kbuild | 37 --- > arch/mn10300/include/uapi/asm/Kbuild | 32 -- > arch/nios2/include/uapi/asm/Kbuild | 4 +- > arch/openrisc/include/asm/Kbuild | 3 - > arch/openrisc/include/uapi/asm/Kbuild | 8 - > arch/parisc/include/uapi/asm/Kbuild | 28 -- > arch/powerpc/include/uapi/asm/Kbuild | 45 --- > arch/s390/include/uapi/asm/Kbuild | 52 --- > arch/score/include/asm/Kbuild | 4 - > arch/score/include/uapi/asm/Kbuild | 32 -- > arch/sh/include/uapi/asm/Kbuild | 23 -- > arch/sparc/include/uapi/asm/Kbuild | 48 --- > arch/tile/include/asm/Kbuild | 3 - > arch/tile/include/uapi/arch/Kbuild | 17 - > arch/tile/include/uapi/asm/Kbuild | 19 +- > arch/unicore32/include/uapi/asm/Kbuild | 6 - > arch/x86/include/uapi/asm/Kbuild | 59 ---- > arch/xtensa/include/uapi/asm/Kbuild | 23 -- > include/Kbuild | 2 - > include/asm-generic/Kbuild.asm | 1 - > include/scsi/fc/Kbuild | 0 > include/uapi/Kbuild | 15 - > include/uapi/asm-generic/Kbuild | 36 --- > include/uapi/asm-generic/Kbuild.asm | 62 ++-- > include/uapi/drm/Kbuild | 22 -- > include/uapi/linux/Kbuild | 482 ---------------------------- > include/uapi/linux/android/Kbuild | 2 - > include/uapi/linux/byteorder/Kbuild | 3 - > include/uapi/linux/caif/Kbuild | 3 - > include/uapi/linux/can/Kbuild | 6 - > include/uapi/linux/dvb/Kbuild | 9 - > include/uapi/linux/hdlc/Kbuild | 2 - > include/uapi/linux/hsi/Kbuild | 2 - > include/uapi/linux/iio/Kbuild | 3 - > include/uapi/linux/isdn/Kbuild | 2 - > include/uapi/linux/mmc/Kbuild | 2 - > include/uapi/linux/netfilter/Kbuild | 89 ----- > include/uapi/linux/netfilter/ipset/Kbuild | 5 - > include/uapi/linux/netfilter_arp/Kbuild | 3 - > include/uapi/linux/netfilter_bridge/Kbuild | 18 -- > include/uapi/linux/netfilter_ipv4/Kbuild | 10 - > include/uapi/linux/netfilter_ipv6/Kbuild | 13 - > include/uapi/linux/nfsd/Kbuild | 6 - > include/uapi/linux/raid/Kbuild | 3 - > include/uapi/linux/spi/Kbuild | 2 - > include/uapi/linux/sunrpc/Kbuild | 2 - > include/uapi/linux/tc_act/Kbuild | 15 - > include/uapi/linux/tc_ematch/Kbuild | 5 - > include/uapi/linux/usb/Kbuild | 12 - > include/uapi/linux/wimax/Kbuild | 2 - > include/uapi/misc/Kbuild | 2 - > include/uapi/mtd/Kbuild | 6 - > include/uapi/rdma/Kbuild | 18 -- > include/uapi/rdma/hfi/Kbuild | 2 - > include/uapi/scsi/Kbuild | 6 - > include/uapi/scsi/fc/Kbuild | 5 - > include/uapi/sound/Kbuild | 16 - > include/uapi/video/Kbuild | 4 - > include/uapi/xen/Kbuild | 5 - > include/video/Kbuild | 0 > scripts/Makefile.headersinst | 39 +-- > 81 files changed, 73 insertions(+), 1745 deletions(-) > delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > delete mode 100644 arch/tile/include/uapi/arch/Kbuild > delete mode 100644 include/Kbuild > delete mode 100644 include/asm-generic/Kbuild.asm > delete mode 100644 include/scsi/fc/Kbuild > delete mode 100644 include/uapi/Kbuild > delete mode 100644 include/uapi/asm-generic/Kbuild > delete mode 100644 include/uapi/drm/Kbuild > delete mode 100644 include/uapi/linux/Kbuild > delete mode 100644 include/uapi/linux/android/Kbuild > delete mode 100644 include/uapi/linux/byteorder/Kbuild > delete mode 100644 include/uapi/linux/caif/Kbuild > delete mode 100644 include/uapi/linux/can/Kbuild > delete mode 100644 include/uapi/linux/dvb/Kbuild > delete mode 100644 include/uapi/linux/hdlc/Kbuild > delete mode 100644 include/uapi/linux/hsi/Kbuild > delete mode 100644 include/uapi/linux/iio/Kbuild > delete mode 100644 include/uapi/linux/isdn/Kbuild > delete mode 100644 include/uapi/linux/mmc/Kbuild > delete mode 100644 include/uapi/linux/netfilter/Kbuild > delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > delete mode 100644 include/uapi/linux/nfsd/Kbuild > delete mode 100644 include/uapi/linux/raid/Kbuild > delete mode 100644 include/uapi/linux/spi/Kbuild > delete mode 100644 include/uapi/linux/sunrpc/Kbuild > delete mode 100644 include/uapi/linux/tc_act/Kbuild > delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > delete mode 100644 include/uapi/linux/usb/Kbuild > delete mode 100644 include/uapi/linux/wimax/Kbuild > delete mode 100644 include/uapi/misc/Kbuild > delete mode 100644 include/uapi/mtd/Kbuild > delete mode 100644 include/uapi/rdma/Kbuild > delete mode 100644 include/uapi/rdma/hfi/Kbuild > delete mode 100644 include/uapi/scsi/Kbuild > delete mode 100644 include/uapi/scsi/fc/Kbuild > delete mode 100644 include/uapi/sound/Kbuild > delete mode 100644 include/uapi/video/Kbuild > delete mode 100644 include/uapi/xen/Kbuild > delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > --- 6.11 Post-link pass > > === 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > --- 7.2 genhdr-y > --- 7.3 generic-y > --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > that may be shared between individual architectures. > The recommended approach how to use a generic header file is > to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > > --- 6.11 Post-link pass > > @@ -1262,37 +1262,36 @@ The pre-processing does: > - drop include of compiler.h > - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > See subsequent chapter for the syntax of the Kbuild file. > > - --- 7.1 header-y > + --- 7.1 subdir-y > > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > > Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > > - The convention is to list one file per line and > + The convention is to list one subdir per line and > preferably in alphabetic order. > > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > --- 7.2 genhdr-y > > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > > Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > > --- 7.3 generic-y > > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > generic-y += bitsperlong.h > generic-y += errno.h > generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h Acked-by: Mark Salter <msalter@redhat.com> > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += auxvec.h > generic-y += barrier.h > generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > generic-y += sockios.h > generic-y += termbits.h > generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > generic-y += mman.h > generic-y += resource.h > generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += atomic.h > generic-y += auxvec.h > generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y += > - > - > generic-y += barrier.h > generic-y += clkdev.h > generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > # UAPI Header export list > -# User exported sparc header files > - > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > generic-y += bug.h > generic-y += bugs.h > generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > genhdr-y += unistd_32.h > genhdr-y += unistd_64.h > genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > $(if \ > $(wildcard \ > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > # ========================================================================== > # Installing headers > # > -# header-y - list files to be installed. They are preprocessed > -# to remove __KERNEL__ section of the file > -# genhdr-y - Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > # > # ========================================================================== > > # generated header directory > gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > > +# Kbuild file is optional > kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > > # called may set destination dir (when installing to asm/) > _dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > > installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > > -header-y := $(sort $(header-y)) > -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y := $(filter-out %/, $(header-y)) > +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs += $(subdir-y) > +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) > > # files used to track state of install/check > install-file := $(installdir)/.install > @@ -35,26 +39,17 @@ check-file := $(installdir)/.check > > # generic-y list all files an architecture uses from asm-generic > # Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > > srcdir := $(srctree)/$(obj) > gendir := $(objtree)/$(gen) > > # all headers files for this dir > -header-y := $(filter-out $(generic-y), $(header-y)) > -all-files := $(header-y) $(genhdr-y) $(wrapper-files) > +all-files := $(header-files) $(genhdr-files) $(wrapper-files) > output-files := $(addprefix $(installdir)/, $(all-files)) > > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > - $(if $(wildcard $(srcdir)/$(hdr)),, \ > - $(error Missing UAPI file $(srcdir)/$(hdr)) \ > - )) > -$(foreach hdr, $(genhdr-y), \ > - $(if $(wildcard $(gendir)/$(hdr)),, \ > - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ > - )) > - > # Work out what needs to be removed > oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > unwanted := $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > file$(if $(word 2, $(all-files)),s)) > cmd_install = \ > - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > for F in $(wrapper-files); do \ > echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ > done; \ ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [Linux-c6x-dev] [PATCH v2 7/7] uapi: export all headers under uapi directories @ 2017-01-11 18:14 ` Mark Salter 0 siblings, 0 replies; 554+ messages in thread From: Mark Salter @ 2017-01-11 18:14 UTC (permalink / raw) To: Nicolas Dichtel, arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k On Fri, 2017-01-06 at 10:43 +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > Documentation/kbuild/makefiles.txt | 41 ++- > arch/alpha/include/uapi/asm/Kbuild | 41 --- > arch/arc/include/uapi/asm/Kbuild | 3 - > arch/arm/include/uapi/asm/Kbuild | 17 - > arch/arm64/include/uapi/asm/Kbuild | 18 -- > arch/avr32/include/uapi/asm/Kbuild | 20 -- > arch/blackfin/include/uapi/asm/Kbuild | 17 - > arch/c6x/include/uapi/asm/Kbuild | 8 - > arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - > arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - > arch/cris/include/uapi/asm/Kbuild | 43 +-- > arch/frv/include/uapi/asm/Kbuild | 33 -- > arch/h8300/include/uapi/asm/Kbuild | 28 -- > arch/hexagon/include/asm/Kbuild | 3 - > arch/hexagon/include/uapi/asm/Kbuild | 13 - > arch/ia64/include/uapi/asm/Kbuild | 45 --- > arch/m32r/include/uapi/asm/Kbuild | 31 -- > arch/m68k/include/uapi/asm/Kbuild | 24 -- > arch/metag/include/uapi/asm/Kbuild | 8 - > arch/microblaze/include/uapi/asm/Kbuild | 32 -- > arch/mips/include/uapi/asm/Kbuild | 37 --- > arch/mn10300/include/uapi/asm/Kbuild | 32 -- > arch/nios2/include/uapi/asm/Kbuild | 4 +- > arch/openrisc/include/asm/Kbuild | 3 - > arch/openrisc/include/uapi/asm/Kbuild | 8 - > arch/parisc/include/uapi/asm/Kbuild | 28 -- > arch/powerpc/include/uapi/asm/Kbuild | 45 --- > arch/s390/include/uapi/asm/Kbuild | 52 --- > arch/score/include/asm/Kbuild | 4 - > arch/score/include/uapi/asm/Kbuild | 32 -- > arch/sh/include/uapi/asm/Kbuild | 23 -- > arch/sparc/include/uapi/asm/Kbuild | 48 --- > arch/tile/include/asm/Kbuild | 3 - > arch/tile/include/uapi/arch/Kbuild | 17 - > arch/tile/include/uapi/asm/Kbuild | 19 +- > arch/unicore32/include/uapi/asm/Kbuild | 6 - > arch/x86/include/uapi/asm/Kbuild | 59 ---- > arch/xtensa/include/uapi/asm/Kbuild | 23 -- > include/Kbuild | 2 - > include/asm-generic/Kbuild.asm | 1 - > include/scsi/fc/Kbuild | 0 > include/uapi/Kbuild | 15 - > include/uapi/asm-generic/Kbuild | 36 --- > include/uapi/asm-generic/Kbuild.asm | 62 ++-- > include/uapi/drm/Kbuild | 22 -- > include/uapi/linux/Kbuild | 482 ---------------------------- > include/uapi/linux/android/Kbuild | 2 - > include/uapi/linux/byteorder/Kbuild | 3 - > include/uapi/linux/caif/Kbuild | 3 - > include/uapi/linux/can/Kbuild | 6 - > include/uapi/linux/dvb/Kbuild | 9 - > include/uapi/linux/hdlc/Kbuild | 2 - > include/uapi/linux/hsi/Kbuild | 2 - > include/uapi/linux/iio/Kbuild | 3 - > include/uapi/linux/isdn/Kbuild | 2 - > include/uapi/linux/mmc/Kbuild | 2 - > include/uapi/linux/netfilter/Kbuild | 89 ----- > include/uapi/linux/netfilter/ipset/Kbuild | 5 - > include/uapi/linux/netfilter_arp/Kbuild | 3 - > include/uapi/linux/netfilter_bridge/Kbuild | 18 -- > include/uapi/linux/netfilter_ipv4/Kbuild | 10 - > include/uapi/linux/netfilter_ipv6/Kbuild | 13 - > include/uapi/linux/nfsd/Kbuild | 6 - > include/uapi/linux/raid/Kbuild | 3 - > include/uapi/linux/spi/Kbuild | 2 - > include/uapi/linux/sunrpc/Kbuild | 2 - > include/uapi/linux/tc_act/Kbuild | 15 - > include/uapi/linux/tc_ematch/Kbuild | 5 - > include/uapi/linux/usb/Kbuild | 12 - > include/uapi/linux/wimax/Kbuild | 2 - > include/uapi/misc/Kbuild | 2 - > include/uapi/mtd/Kbuild | 6 - > include/uapi/rdma/Kbuild | 18 -- > include/uapi/rdma/hfi/Kbuild | 2 - > include/uapi/scsi/Kbuild | 6 - > include/uapi/scsi/fc/Kbuild | 5 - > include/uapi/sound/Kbuild | 16 - > include/uapi/video/Kbuild | 4 - > include/uapi/xen/Kbuild | 5 - > include/video/Kbuild | 0 > scripts/Makefile.headersinst | 39 +-- > 81 files changed, 73 insertions(+), 1745 deletions(-) > delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > delete mode 100644 arch/tile/include/uapi/arch/Kbuild > delete mode 100644 include/Kbuild > delete mode 100644 include/asm-generic/Kbuild.asm > delete mode 100644 include/scsi/fc/Kbuild > delete mode 100644 include/uapi/Kbuild > delete mode 100644 include/uapi/asm-generic/Kbuild > delete mode 100644 include/uapi/drm/Kbuild > delete mode 100644 include/uapi/linux/Kbuild > delete mode 100644 include/uapi/linux/android/Kbuild > delete mode 100644 include/uapi/linux/byteorder/Kbuild > delete mode 100644 include/uapi/linux/caif/Kbuild > delete mode 100644 include/uapi/linux/can/Kbuild > delete mode 100644 include/uapi/linux/dvb/Kbuild > delete mode 100644 include/uapi/linux/hdlc/Kbuild > delete mode 100644 include/uapi/linux/hsi/Kbuild > delete mode 100644 include/uapi/linux/iio/Kbuild > delete mode 100644 include/uapi/linux/isdn/Kbuild > delete mode 100644 include/uapi/linux/mmc/Kbuild > delete mode 100644 include/uapi/linux/netfilter/Kbuild > delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > delete mode 100644 include/uapi/linux/nfsd/Kbuild > delete mode 100644 include/uapi/linux/raid/Kbuild > delete mode 100644 include/uapi/linux/spi/Kbuild > delete mode 100644 include/uapi/linux/sunrpc/Kbuild > delete mode 100644 include/uapi/linux/tc_act/Kbuild > delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > delete mode 100644 include/uapi/linux/usb/Kbuild > delete mode 100644 include/uapi/linux/wimax/Kbuild > delete mode 100644 include/uapi/misc/Kbuild > delete mode 100644 include/uapi/mtd/Kbuild > delete mode 100644 include/uapi/rdma/Kbuild > delete mode 100644 include/uapi/rdma/hfi/Kbuild > delete mode 100644 include/uapi/scsi/Kbuild > delete mode 100644 include/uapi/scsi/fc/Kbuild > delete mode 100644 include/uapi/sound/Kbuild > delete mode 100644 include/uapi/video/Kbuild > delete mode 100644 include/uapi/xen/Kbuild > delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > --- 6.11 Post-link pass > > === 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > --- 7.2 genhdr-y > --- 7.3 generic-y > --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > that may be shared between individual architectures. > The recommended approach how to use a generic header file is > to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > > --- 6.11 Post-link pass > > @@ -1262,37 +1262,36 @@ The pre-processing does: > - drop include of compiler.h > - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > See subsequent chapter for the syntax of the Kbuild file. > > - --- 7.1 header-y > + --- 7.1 subdir-y > > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > > Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > > - The convention is to list one file per line and > + The convention is to list one subdir per line and > preferably in alphabetic order. > > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > --- 7.2 genhdr-y > > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > > Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > > --- 7.3 generic-y > > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > generic-y += bitsperlong.h > generic-y += errno.h > generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h Acked-by: Mark Salter <msalter@redhat.com> > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += auxvec.h > generic-y += barrier.h > generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > generic-y += sockios.h > generic-y += termbits.h > generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > generic-y += mman.h > generic-y += resource.h > generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += atomic.h > generic-y += auxvec.h > generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y += > - > - > generic-y += barrier.h > generic-y += clkdev.h > generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > # UAPI Header export list > -# User exported sparc header files > - > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > generic-y += bug.h > generic-y += bugs.h > generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > genhdr-y += unistd_32.h > genhdr-y += unistd_64.h > genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > $(if \ > $(wildcard \ > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > # ========================================================================== > # Installing headers > # > -# header-y - list files to be installed. They are preprocessed > -# to remove __KERNEL__ section of the file > -# genhdr-y - Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > # > # ========================================================================== > > # generated header directory > gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > > +# Kbuild file is optional > kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > > # called may set destination dir (when installing to asm/) > _dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > > installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > > -header-y := $(sort $(header-y)) > -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y := $(filter-out %/, $(header-y)) > +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs += $(subdir-y) > +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) > > # files used to track state of install/check > install-file := $(installdir)/.install > @@ -35,26 +39,17 @@ check-file := $(installdir)/.check > > # generic-y list all files an architecture uses from asm-generic > # Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > > srcdir := $(srctree)/$(obj) > gendir := $(objtree)/$(gen) > > # all headers files for this dir > -header-y := $(filter-out $(generic-y), $(header-y)) > -all-files := $(header-y) $(genhdr-y) $(wrapper-files) > +all-files := $(header-files) $(genhdr-files) $(wrapper-files) > output-files := $(addprefix $(installdir)/, $(all-files)) > > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > - $(if $(wildcard $(srcdir)/$(hdr)),, \ > - $(error Missing UAPI file $(srcdir)/$(hdr)) \ > - )) > -$(foreach hdr, $(genhdr-y), \ > - $(if $(wildcard $(gendir)/$(hdr)),, \ > - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ > - )) > - > # Work out what needs to be removed > oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > unwanted := $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > file$(if $(word 2, $(all-files)),s)) > cmd_install = \ > - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > for F in $(wrapper-files); do \ > echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ > done; \ ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [Linux-c6x-dev] [PATCH v2 7/7] uapi: export all headers under uapi directories 2017-01-06 9:43 ` Nicolas Dichtel ` (18 preceding siblings ...) (?) @ 2017-01-11 18:14 ` Mark Salter -1 siblings, 0 replies; 554+ messages in thread From: Mark Salter @ 2017-01-11 18:14 UTC (permalink / raw) To: Nicolas Dichtel, arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, linux-m68k, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, openrisc, linux-metag, linux-arm-kernel On Fri, 2017-01-06 at 10:43 +0100, Nicolas Dichtel wrote: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-hexagon/shmparam.h > asm-mips/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > drm/vgem_drm.h > drm/armada_drm.h > drm/omap_drm.h > drm/etnaviv_drm.h > asm-tile/shmparam.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-powerpc/perf_regs.h > rdma/qedr-abi.h > asm-parisc/kvm_para.h > asm-openrisc/shmparam.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-xtensa/kvm_para.h > asm-avr32/kvm_para.h > asm-m32r/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > linux/bcache.h > linux/kvm.h > linux/kvm_para.h > linux/kfd_ioctl.h > linux/cryptouser.h > linux/kcm.h > linux/kcov.h > linux/seg6_iptunnel.h > linux/stm.h > linux/genwqe > linux/genwqe/.install > linux/genwqe/genwqe_card.h > linux/genwqe/..install.cmd > linux/seg6.h > linux/cifs > linux/cifs/.install > linux/cifs/cifs_mount.h > linux/cifs/..install.cmd > linux/auto_dev-ioctl.h > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > subdirs with a pure makefile command. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > Documentation/kbuild/makefiles.txt | 41 ++- > arch/alpha/include/uapi/asm/Kbuild | 41 --- > arch/arc/include/uapi/asm/Kbuild | 3 - > arch/arm/include/uapi/asm/Kbuild | 17 - > arch/arm64/include/uapi/asm/Kbuild | 18 -- > arch/avr32/include/uapi/asm/Kbuild | 20 -- > arch/blackfin/include/uapi/asm/Kbuild | 17 - > arch/c6x/include/uapi/asm/Kbuild | 8 - > arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - > arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - > arch/cris/include/uapi/asm/Kbuild | 43 +-- > arch/frv/include/uapi/asm/Kbuild | 33 -- > arch/h8300/include/uapi/asm/Kbuild | 28 -- > arch/hexagon/include/asm/Kbuild | 3 - > arch/hexagon/include/uapi/asm/Kbuild | 13 - > arch/ia64/include/uapi/asm/Kbuild | 45 --- > arch/m32r/include/uapi/asm/Kbuild | 31 -- > arch/m68k/include/uapi/asm/Kbuild | 24 -- > arch/metag/include/uapi/asm/Kbuild | 8 - > arch/microblaze/include/uapi/asm/Kbuild | 32 -- > arch/mips/include/uapi/asm/Kbuild | 37 --- > arch/mn10300/include/uapi/asm/Kbuild | 32 -- > arch/nios2/include/uapi/asm/Kbuild | 4 +- > arch/openrisc/include/asm/Kbuild | 3 - > arch/openrisc/include/uapi/asm/Kbuild | 8 - > arch/parisc/include/uapi/asm/Kbuild | 28 -- > arch/powerpc/include/uapi/asm/Kbuild | 45 --- > arch/s390/include/uapi/asm/Kbuild | 52 --- > arch/score/include/asm/Kbuild | 4 - > arch/score/include/uapi/asm/Kbuild | 32 -- > arch/sh/include/uapi/asm/Kbuild | 23 -- > arch/sparc/include/uapi/asm/Kbuild | 48 --- > arch/tile/include/asm/Kbuild | 3 - > arch/tile/include/uapi/arch/Kbuild | 17 - > arch/tile/include/uapi/asm/Kbuild | 19 +- > arch/unicore32/include/uapi/asm/Kbuild | 6 - > arch/x86/include/uapi/asm/Kbuild | 59 ---- > arch/xtensa/include/uapi/asm/Kbuild | 23 -- > include/Kbuild | 2 - > include/asm-generic/Kbuild.asm | 1 - > include/scsi/fc/Kbuild | 0 > include/uapi/Kbuild | 15 - > include/uapi/asm-generic/Kbuild | 36 --- > include/uapi/asm-generic/Kbuild.asm | 62 ++-- > include/uapi/drm/Kbuild | 22 -- > include/uapi/linux/Kbuild | 482 ---------------------------- > include/uapi/linux/android/Kbuild | 2 - > include/uapi/linux/byteorder/Kbuild | 3 - > include/uapi/linux/caif/Kbuild | 3 - > include/uapi/linux/can/Kbuild | 6 - > include/uapi/linux/dvb/Kbuild | 9 - > include/uapi/linux/hdlc/Kbuild | 2 - > include/uapi/linux/hsi/Kbuild | 2 - > include/uapi/linux/iio/Kbuild | 3 - > include/uapi/linux/isdn/Kbuild | 2 - > include/uapi/linux/mmc/Kbuild | 2 - > include/uapi/linux/netfilter/Kbuild | 89 ----- > include/uapi/linux/netfilter/ipset/Kbuild | 5 - > include/uapi/linux/netfilter_arp/Kbuild | 3 - > include/uapi/linux/netfilter_bridge/Kbuild | 18 -- > include/uapi/linux/netfilter_ipv4/Kbuild | 10 - > include/uapi/linux/netfilter_ipv6/Kbuild | 13 - > include/uapi/linux/nfsd/Kbuild | 6 - > include/uapi/linux/raid/Kbuild | 3 - > include/uapi/linux/spi/Kbuild | 2 - > include/uapi/linux/sunrpc/Kbuild | 2 - > include/uapi/linux/tc_act/Kbuild | 15 - > include/uapi/linux/tc_ematch/Kbuild | 5 - > include/uapi/linux/usb/Kbuild | 12 - > include/uapi/linux/wimax/Kbuild | 2 - > include/uapi/misc/Kbuild | 2 - > include/uapi/mtd/Kbuild | 6 - > include/uapi/rdma/Kbuild | 18 -- > include/uapi/rdma/hfi/Kbuild | 2 - > include/uapi/scsi/Kbuild | 6 - > include/uapi/scsi/fc/Kbuild | 5 - > include/uapi/sound/Kbuild | 16 - > include/uapi/video/Kbuild | 4 - > include/uapi/xen/Kbuild | 5 - > include/video/Kbuild | 0 > scripts/Makefile.headersinst | 39 +-- > 81 files changed, 73 insertions(+), 1745 deletions(-) > delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild > delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild > delete mode 100644 arch/tile/include/uapi/arch/Kbuild > delete mode 100644 include/Kbuild > delete mode 100644 include/asm-generic/Kbuild.asm > delete mode 100644 include/scsi/fc/Kbuild > delete mode 100644 include/uapi/Kbuild > delete mode 100644 include/uapi/asm-generic/Kbuild > delete mode 100644 include/uapi/drm/Kbuild > delete mode 100644 include/uapi/linux/Kbuild > delete mode 100644 include/uapi/linux/android/Kbuild > delete mode 100644 include/uapi/linux/byteorder/Kbuild > delete mode 100644 include/uapi/linux/caif/Kbuild > delete mode 100644 include/uapi/linux/can/Kbuild > delete mode 100644 include/uapi/linux/dvb/Kbuild > delete mode 100644 include/uapi/linux/hdlc/Kbuild > delete mode 100644 include/uapi/linux/hsi/Kbuild > delete mode 100644 include/uapi/linux/iio/Kbuild > delete mode 100644 include/uapi/linux/isdn/Kbuild > delete mode 100644 include/uapi/linux/mmc/Kbuild > delete mode 100644 include/uapi/linux/netfilter/Kbuild > delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild > delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild > delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild > delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild > delete mode 100644 include/uapi/linux/nfsd/Kbuild > delete mode 100644 include/uapi/linux/raid/Kbuild > delete mode 100644 include/uapi/linux/spi/Kbuild > delete mode 100644 include/uapi/linux/sunrpc/Kbuild > delete mode 100644 include/uapi/linux/tc_act/Kbuild > delete mode 100644 include/uapi/linux/tc_ematch/Kbuild > delete mode 100644 include/uapi/linux/usb/Kbuild > delete mode 100644 include/uapi/linux/wimax/Kbuild > delete mode 100644 include/uapi/misc/Kbuild > delete mode 100644 include/uapi/mtd/Kbuild > delete mode 100644 include/uapi/rdma/Kbuild > delete mode 100644 include/uapi/rdma/hfi/Kbuild > delete mode 100644 include/uapi/scsi/Kbuild > delete mode 100644 include/uapi/scsi/fc/Kbuild > delete mode 100644 include/uapi/sound/Kbuild > delete mode 100644 include/uapi/video/Kbuild > delete mode 100644 include/uapi/xen/Kbuild > delete mode 100644 include/video/Kbuild > > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt > index 37b525d329ae..53e31061ff18 100644 > --- a/Documentation/kbuild/makefiles.txt > +++ b/Documentation/kbuild/makefiles.txt > @@ -44,7 +44,7 @@ This document describes the Linux kernel Makefiles. > --- 6.11 Post-link pass > > === 7 Kbuild syntax for exported headers > - --- 7.1 header-y > + --- 7.1 subdir-y > --- 7.2 genhdr-y > --- 7.3 generic-y > --- 7.4 generated-y > @@ -1235,7 +1235,7 @@ When kbuild executes, the following steps are followed (roughly): > that may be shared between individual architectures. > The recommended approach how to use a generic header file is > to list the file in the Kbuild file. > - See "7.4 generic-y" for further info on syntax etc. > + See "7.3 generic-y" for further info on syntax etc. > > --- 6.11 Post-link pass > > @@ -1262,37 +1262,36 @@ The pre-processing does: > - drop include of compiler.h > - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) > > -Each relevant directory contains a file name "Kbuild" which specifies the > -headers to be exported. > +All headers under include/uapi/, include/generated/uapi/, > +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ > +are exported. > + > +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and > +arch/<arch>/include/asm/ to list asm files coming from asm-generic. > See subsequent chapter for the syntax of the Kbuild file. > > - --- 7.1 header-y > + --- 7.1 subdir-y > > - header-y specifies header files to be exported. > + subdir-y may be used to specify a subdirectory to be exported. > > Example: > - #include/linux/Kbuild > - header-y += usb/ > - header-y += aio_abi.h > + #arch/cris/include/uapi/asm/Kbuild > + subdir-y += ../arch-v10/arch/ > + subdir-y += ../arch-v32/arch/ > > - The convention is to list one file per line and > + The convention is to list one subdir per line and > preferably in alphabetic order. > > - header-y also specifies which subdirectories to visit. > - A subdirectory is identified by a trailing '/' which > - can be seen in the example above for the usb subdirectory. > - > - Subdirectories are visited before their parent directories. > - > --- 7.2 genhdr-y > > - genhdr-y specifies generated files to be exported. > - Generated files are special as they need to be looked > - up in another directory when doing 'make O=...' builds. > + genhdr-y specifies asm files to be generated. > > Example: > - #include/linux/Kbuild > - genhdr-y += version.h > + #arch/x86/include/uapi/asm/Kbuild > + genhdr-y += unistd_32.h > + genhdr-y += unistd_64.h > + genhdr-y += unistd_x32.h > + > > --- 7.3 generic-y > > diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild > index d96f2ef5b639..b15bf6bc0e94 100644 > --- a/arch/alpha/include/uapi/asm/Kbuild > +++ b/arch/alpha/include/uapi/asm/Kbuild > @@ -1,43 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += compiler.h > -header-y += console.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gentrap.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += pal.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += reg.h > -header-y += regdef.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 += sysinfo.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild > index f50d02df78d5..b15bf6bc0e94 100644 > --- a/arch/arc/include/uapi/asm/Kbuild > +++ b/arch/arc/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > -header-y += elf.h > -header-y += page.h > -header-y += cachectl.h > diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild > index 46a76cd6acb6..607f702c2d62 100644 > --- a/arch/arm/include/uapi/asm/Kbuild > +++ b/arch/arm/include/uapi/asm/Kbuild > @@ -1,23 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += perf_regs.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += unistd.h > genhdr-y += unistd-common.h > genhdr-y += unistd-oabi.h > genhdr-y += unistd-eabi.h > diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild > index 825b0fe51c2b..13a97aa2285f 100644 > --- a/arch/arm64/include/uapi/asm/Kbuild > +++ b/arch/arm64/include/uapi/asm/Kbuild > @@ -2,21 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += fcntl.h > -header-y += hwcap.h > -header-y += kvm_para.h > -header-y += perf_regs.h > -header-y += param.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += statfs.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild > index 08d8a3d76ea8..610395083364 100644 > --- a/arch/avr32/include/uapi/asm/Kbuild > +++ b/arch/avr32/include/uapi/asm/Kbuild > @@ -1,26 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > generic-y += bitsperlong.h > generic-y += errno.h > generic-y += fcntl.h > diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild > index 0bd28f77abc3..b15bf6bc0e94 100644 > --- a/arch/blackfin/include/uapi/asm/Kbuild > +++ b/arch/blackfin/include/uapi/asm/Kbuild > @@ -1,19 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bfin_sport.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += fixed_code.h > -header-y += ioctls.h > -header-y += kvm_para.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild > index e9bc2b2b8147..13a97aa2285f 100644 > --- a/arch/c6x/include/uapi/asm/Kbuild > +++ b/arch/c6x/include/uapi/asm/Kbuild > @@ -2,11 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += swab.h > -header-y += unistd.h Acked-by: Mark Salter <msalter@redhat.com> > diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild > deleted file mode 100644 > index 9048c87a782b..000000000000 > --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += sv_addr.agh > -header-y += sv_addr_ag.h > -header-y += svinto.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild > deleted file mode 100644 > index 59efffd16b61..000000000000 > --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += cryptocop.h > -header-y += user.h > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d5564a0ae66a..d0c5471856e0 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,44 +1,5 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += ../arch-v10/arch/ > -header-y += ../arch-v32/arch/ > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += elf_v10.h > -header-y += elf_v32.h > -header-y += errno.h > -header-y += ethernet.h > -header-y += etraxgpio.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 += ptrace_v10.h > -header-y += ptrace_v32.h > -header-y += resource.h > -header-y += rs485.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 += sync_serial.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > +subdir-y += ../arch-v10/arch/ > +subdir-y += ../arch-v32/arch/ > diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild > index 42a2b33461c0..b15bf6bc0e94 100644 > --- a/arch/frv/include/uapi/asm/Kbuild > +++ b/arch/frv/include/uapi/asm/Kbuild > @@ -1,35 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild > index fb6101a5d4f1..b15bf6bc0e94 100644 > --- a/arch/h8300/include/uapi/asm/Kbuild > +++ b/arch/h8300/include/uapi/asm/Kbuild > @@ -1,30 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild > index db8ddabc6bd2..f3b1ceb5c1e4 100644 > --- a/arch/hexagon/include/asm/Kbuild > +++ b/arch/hexagon/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += auxvec.h > generic-y += barrier.h > generic-y += bug.h > diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild > index c31706c38631..b15bf6bc0e94 100644 > --- a/arch/hexagon/include/uapi/asm/Kbuild > +++ b/arch/hexagon/include/uapi/asm/Kbuild > @@ -1,15 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += registers.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += swab.h > -header-y += unistd.h > -header-y += user.h > diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild > index 891002bbb995..13a97aa2285f 100644 > --- a/arch/ia64/include/uapi/asm/Kbuild > +++ b/arch/ia64/include/uapi/asm/Kbuild > @@ -2,48 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += kvm_para.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cmpxchg.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += fpu.h > -header-y += gcc_intrin.h > -header-y += ia64regs.h > -header-y += intel_intrin.h > -header-y += intrinsics.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += perfmon.h > -header-y += perfmon_default_smpl.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += ptrace_offsets.h > -header-y += resource.h > -header-y += rse.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 += ucontext.h > -header-y += unistd.h > -header-y += ustack.h > diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild > index 43937a61d6cf..b15bf6bc0e94 100644 > --- a/arch/m32r/include/uapi/asm/Kbuild > +++ b/arch/m32r/include/uapi/asm/Kbuild > @@ -1,33 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 > diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild > index 6a2d257bdfb2..64368077235a 100644 > --- a/arch/m68k/include/uapi/asm/Kbuild > +++ b/arch/m68k/include/uapi/asm/Kbuild > @@ -9,27 +9,3 @@ generic-y += socket.h > generic-y += sockios.h > generic-y += termbits.h > generic-y += termios.h > - > -header-y += a.out.h > -header-y += bootinfo.h > -header-y += bootinfo-amiga.h > -header-y += bootinfo-apollo.h > -header-y += bootinfo-atari.h > -header-y += bootinfo-hp300.h > -header-y += bootinfo-mac.h > -header-y += bootinfo-q40.h > -header-y += bootinfo-vme.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += fcntl.h > -header-y += ioctls.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += unistd.h > diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild > index ab78be2b6eb0..b29731ebd7a9 100644 > --- a/arch/metag/include/uapi/asm/Kbuild > +++ b/arch/metag/include/uapi/asm/Kbuild > @@ -1,14 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += ech.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += swab.h > -header-y += unistd.h > - > generic-y += mman.h > generic-y += resource.h > generic-y += setup.h > diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild > index 1aac99f87df1..2178c78c7c1a 100644 > --- a/arch/microblaze/include/uapi/asm/Kbuild > +++ b/arch/microblaze/include/uapi/asm/Kbuild > @@ -2,35 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += types.h > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += elf.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.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 += unistd.h > diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild > index f2cf41461146..a0266feba9e6 100644 > --- a/arch/mips/include/uapi/asm/Kbuild > +++ b/arch/mips/include/uapi/asm/Kbuild > @@ -2,40 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += ipcbuf.h > - > -header-y += auxvec.h > -header-y += bitfield.h > -header-y += bitsperlong.h > -header-y += break.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += inst.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += kvm_para.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 += sgidefs.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 += sysmips.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += unistd.h > diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/mn10300/include/uapi/asm/Kbuild > +++ b/arch/mn10300/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild > index e0bb972a50d7..766455d0d291 100644 > --- a/arch/nios2/include/uapi/asm/Kbuild > +++ b/arch/nios2/include/uapi/asm/Kbuild > @@ -1,5 +1,3 @@ > +# UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += elf.h > - > generic-y += ucontext.h > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index 2832f031fb11..561915716fd9 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ucontext.h > - > generic-y += atomic.h > generic-y += auxvec.h > generic-y += barrier.h > diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild > index 80761eb82b5f..b15bf6bc0e94 100644 > --- a/arch/openrisc/include/uapi/asm/Kbuild > +++ b/arch/openrisc/include/uapi/asm/Kbuild > @@ -1,10 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += byteorder.h > -header-y += elf.h > -header-y += kvm_para.h > -header-y += param.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild > index 348356c99514..3971c60a7e7f 100644 > --- a/arch/parisc/include/uapi/asm/Kbuild > +++ b/arch/parisc/include/uapi/asm/Kbuild > @@ -2,31 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += resource.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 += pdc.h > -header-y += posix_types.h > -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild > index dab3717e3ea0..b15bf6bc0e94 100644 > --- a/arch/powerpc/include/uapi/asm/Kbuild > +++ b/arch/powerpc/include/uapi/asm/Kbuild > @@ -1,47 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += bootx.h > -header-y += byteorder.h > -header-y += cputable.h > -header-y += eeh.h > -header-y += elf.h > -header-y += epapr_hcalls.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += nvram.h > -header-y += opal-prd.h > -header-y += param.h > -header-y += perf_event.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ps3fb.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 += spu_info.h > -header-y += stat.h > -header-y += statfs.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += tm.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild > index bf736e764cb4..b15bf6bc0e94 100644 > --- a/arch/s390/include/uapi/asm/Kbuild > +++ b/arch/s390/include/uapi/asm/Kbuild > @@ -1,54 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += chpid.h > -header-y += chsc.h > -header-y += clp.h > -header-y += cmb.h > -header-y += dasd.h > -header-y += debug.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hypfs.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += kvm_virtio.h > -header-y += mman.h > -header-y += monwriter.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += ptrace.h > -header-y += qeth.h > -header-y += resource.h > -header-y += schid.h > -header-y += sclp_ctl.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sie.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 += tape390.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += virtio-ccw.h > -header-y += vtoc.h > -header-y += zcrypt.h > diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild > index a05218ff3fe4..128ca7ec0220 100644 > --- a/arch/score/include/asm/Kbuild > +++ b/arch/score/include/asm/Kbuild > @@ -1,7 +1,3 @@ > - > -header-y += > - > - > generic-y += barrier.h > generic-y += clkdev.h > generic-y += cputime.h > diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild > index 040178cdb3eb..b15bf6bc0e94 100644 > --- a/arch/score/include/uapi/asm/Kbuild > +++ b/arch/score/include/uapi/asm/Kbuild > @@ -1,34 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild > index 60613ae78513..b15bf6bc0e94 100644 > --- a/arch/sh/include/uapi/asm/Kbuild > +++ b/arch/sh/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += cpu-features.h > -header-y += hw_breakpoint.h > -header-y += ioctls.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += ptrace.h > -header-y += ptrace_32.h > -header-y += ptrace_64.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += types.h > -header-y += unistd.h > -header-y += unistd_32.h > -header-y += unistd_64.h > diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild > index b5843ee09fb5..b15bf6bc0e94 100644 > --- a/arch/sparc/include/uapi/asm/Kbuild > +++ b/arch/sparc/include/uapi/asm/Kbuild > @@ -1,50 +1,2 @@ > # UAPI Header export list > -# User exported sparc header files > - > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += apc.h > -header-y += asi.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += display7seg.h > -header-y += envctrl.h > -header-y += errno.h > -header-y += fbio.h > -header-y += fcntl.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += jsflash.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += openpromio.h > -header-y += param.h > -header-y += perfctr.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += psr.h > -header-y += psrcompat.h > -header-y += pstate.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 += traps.h > -header-y += uctx.h > -header-y += unistd.h > -header-y += utrap.h > -header-y += watchdog.h > diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild > index 2d1f5638974c..057eaa533877 100644 > --- a/arch/tile/include/asm/Kbuild > +++ b/arch/tile/include/asm/Kbuild > @@ -1,6 +1,3 @@ > - > -header-y += ../arch/ > - > generic-y += bug.h > generic-y += bugs.h > generic-y += clkdev.h > diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild > deleted file mode 100644 > index 97dfbecec6b6..000000000000 > --- a/arch/tile/include/uapi/arch/Kbuild > +++ /dev/null > @@ -1,17 +0,0 @@ > -# UAPI Header export list > -header-y += abi.h > -header-y += chip.h > -header-y += chip_tilegx.h > -header-y += chip_tilepro.h > -header-y += icache.h > -header-y += interrupts.h > -header-y += interrupts_32.h > -header-y += interrupts_64.h > -header-y += opcode.h > -header-y += opcode_tilegx.h > -header-y += opcode_tilepro.h > -header-y += sim.h > -header-y += sim_def.h > -header-y += spr_def.h > -header-y += spr_def_32.h > -header-y += spr_def_64.h > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index c20db8e428bf..e0a50111e07f 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -1,21 +1,6 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += byteorder.h > -header-y += cachectl.h > -header-y += hardwall.h > -header-y += kvm_para.h > -header-y += mman.h > -header-y += ptrace.h > -header-y += setup.h > -header-y += sigcontext.h > -header-y += siginfo.h > -header-y += signal.h > -header-y += stat.h > -header-y += swab.h > -header-y += ucontext.h > -header-y += unistd.h > - > generic-y += ucontext.h > + > +subdir-y += ../arch > diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild > index 0514d7ad6855..13a97aa2285f 100644 > --- a/arch/unicore32/include/uapi/asm/Kbuild > +++ b/arch/unicore32/include/uapi/asm/Kbuild > @@ -1,10 +1,4 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > > -header-y += byteorder.h > -header-y += kvm_para.h > -header-y += ptrace.h > -header-y += sigcontext.h > -header-y += unistd.h > - > generic-y += kvm_para.h > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..83b6e9a0dce4 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm > genhdr-y += unistd_32.h > genhdr-y += unistd_64.h > genhdr-y += unistd_x32.h > -header-y += a.out.h > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += boot.h > -header-y += bootparam.h > -header-y += byteorder.h > -header-y += debugreg.h > -header-y += e820.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += hw_breakpoint.h > -header-y += hyperv.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += ist.h > -header-y += kvm.h > -header-y += kvm_para.h > -header-y += kvm_perf.h > -header-y += ldt.h > -header-y += mce.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += msr-index.h > -header-y += msr.h > -header-y += mtrr.h > -header-y += param.h > -header-y += perf_regs.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += posix_types_32.h > -header-y += posix_types_64.h > -header-y += posix_types_x32.h > -header-y += prctl.h > -header-y += processor-flags.h > -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h > -header-y += swab.h > -header-y += termbits.h > -header-y += termios.h > -header-y += types.h > -header-y += ucontext.h > -header-y += unistd.h > -header-y += vm86.h > -header-y += vmx.h > -header-y += vsyscall.h > diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild > index 56aad54e7fb7..b15bf6bc0e94 100644 > --- a/arch/xtensa/include/uapi/asm/Kbuild > +++ b/arch/xtensa/include/uapi/asm/Kbuild > @@ -1,25 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -header-y += auxvec.h > -header-y += byteorder.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 += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += sigcontext.h > -header-y += signal.h > -header-y += socket.h > -header-y += sockios.h > -header-y += stat.h > -header-y += swab.h > -header-y += termbits.h > -header-y += types.h > -header-y += unistd.h > diff --git a/include/Kbuild b/include/Kbuild > deleted file mode 100644 > index bab1145bc7a7..000000000000 > --- a/include/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm > deleted file mode 100644 > index d2ee86b4c091..000000000000 > --- a/include/asm-generic/Kbuild.asm > +++ /dev/null > @@ -1 +0,0 @@ > -include include/uapi/asm-generic/Kbuild.asm > diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild > deleted file mode 100644 > index 245aa6e05e6a..000000000000 > --- a/include/uapi/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -# Top-level Makefile calls into asm-$(ARCH) > -# List only non-arch directories below > - > - > -header-y += asm-generic/ > -header-y += linux/ > -header-y += sound/ > -header-y += mtd/ > -header-y += rdma/ > -header-y += video/ > -header-y += drm/ > -header-y += xen/ > -header-y += scsi/ > -header-y += misc/ > diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild > deleted file mode 100644 > index b73de7bb7a62..000000000000 > --- a/include/uapi/asm-generic/Kbuild > +++ /dev/null > @@ -1,36 +0,0 @@ > -# UAPI Header export list > -header-y += auxvec.h > -header-y += bitsperlong.h > -header-y += errno-base.h > -header-y += errno.h > -header-y += fcntl.h > -header-y += int-l64.h > -header-y += int-ll64.h > -header-y += ioctl.h > -header-y += ioctls.h > -header-y += ipcbuf.h > -header-y += kvm_para.h > -header-y += mman-common.h > -header-y += mman.h > -header-y += msgbuf.h > -header-y += param.h > -header-y += poll.h > -header-y += posix_types.h > -header-y += resource.h > -header-y += sembuf.h > -header-y += setup.h > -header-y += shmbuf.h > -header-y += shmparam.h > -header-y += siginfo.h > -header-y += signal-defs.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 += ucontext.h > -header-y += unistd.h > diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm > index fcd50b759217..c13805d5a2a0 100644 > --- a/include/uapi/asm-generic/Kbuild.asm > +++ b/include/uapi/asm-generic/Kbuild.asm > @@ -8,38 +8,38 @@ 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 > +generic-y += auxvec.h > +generic-y += bitsperlong.h > +generic-y += byteorder.h > +generic-y += errno.h > +generic-y += fcntl.h > +generic-y += ioctl.h > +generic-y += ioctls.h > +generic-y += ipcbuf.h > +generic-y += mman.h > +generic-y += msgbuf.h > +generic-y += param.h > +generic-y += poll.h > +generic-y += posix_types.h > +generic-y += ptrace.h > +generic-y += resource.h > +generic-y += sembuf.h > +generic-y += setup.h > +generic-y += shmbuf.h > +generic-y += sigcontext.h > +generic-y += siginfo.h > +generic-y += signal.h > +generic-y += socket.h > +generic-y += sockios.h > +generic-y += stat.h > +generic-y += statfs.h > +generic-y += swab.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += types.h > +generic-y += unistd.h > > -header-y += $(foreach hdr,$(opt-header), \ > +generic-y += $(foreach hdr,$(opt-header), \ > $(if \ > $(wildcard \ > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild > deleted file mode 100644 > index 9355dd8eff3b..000000000000 > --- a/include/uapi/drm/Kbuild > +++ /dev/null > @@ -1,22 +0,0 @@ > -# UAPI Header export list > -header-y += drm.h > -header-y += drm_fourcc.h > -header-y += drm_mode.h > -header-y += drm_sarea.h > -header-y += amdgpu_drm.h > -header-y += exynos_drm.h > -header-y += i810_drm.h > -header-y += i915_drm.h > -header-y += mga_drm.h > -header-y += nouveau_drm.h > -header-y += qxl_drm.h > -header-y += r128_drm.h > -header-y += radeon_drm.h > -header-y += savage_drm.h > -header-y += sis_drm.h > -header-y += tegra_drm.h > -header-y += via_drm.h > -header-y += vmwgfx_drm.h > -header-y += msm_drm.h > -header-y += vc4_drm.h > -header-y += virtgpu_drm.h > diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild > deleted file mode 100644 > index a8b93e685239..000000000000 > --- a/include/uapi/linux/Kbuild > +++ /dev/null > @@ -1,482 +0,0 @@ > -# UAPI Header export list > -header-y += android/ > -header-y += byteorder/ > -header-y += can/ > -header-y += caif/ > -header-y += dvb/ > -header-y += hdlc/ > -header-y += hsi/ > -header-y += iio/ > -header-y += isdn/ > -header-y += mmc/ > -header-y += nfsd/ > -header-y += raid/ > -header-y += spi/ > -header-y += sunrpc/ > -header-y += tc_act/ > -header-y += tc_ematch/ > -header-y += netfilter/ > -header-y += netfilter_arp/ > -header-y += netfilter_bridge/ > -header-y += netfilter_ipv4/ > -header-y += netfilter_ipv6/ > -header-y += usb/ > -header-y += wimax/ > - > -genhdr-y += version.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) > -header-y += a.out.h > -endif > - > -header-y += acct.h > -header-y += adb.h > -header-y += adfs_fs.h > -header-y += affs_hardblocks.h > -header-y += agpgart.h > -header-y += aio_abi.h > -header-y += am437x-vpfe.h > -header-y += apm_bios.h > -header-y += arcfb.h > -header-y += atalk.h > -header-y += atmapi.h > -header-y += atmarp.h > -header-y += atmbr2684.h > -header-y += atmclip.h > -header-y += atmdev.h > -header-y += atm_eni.h > -header-y += atm.h > -header-y += atm_he.h > -header-y += atm_idt77105.h > -header-y += atmioc.h > -header-y += atmlec.h > -header-y += atmmpc.h > -header-y += atm_nicstar.h > -header-y += atmppp.h > -header-y += atmsap.h > -header-y += atmsvc.h > -header-y += atm_tcp.h > -header-y += atm_zatm.h > -header-y += audit.h > -header-y += auto_fs4.h > -header-y += auto_fs.h > -header-y += auxvec.h > -header-y += ax25.h > -header-y += b1lli.h > -header-y += baycom.h > -header-y += bcm933xx_hcs.h > -header-y += bfs_fs.h > -header-y += binfmts.h > -header-y += blkpg.h > -header-y += blktrace_api.h > -header-y += blkzoned.h > -header-y += bpf_common.h > -header-y += bpf_perf_event.h > -header-y += bpf.h > -header-y += bpqether.h > -header-y += bsg.h > -header-y += bt-bmc.h > -header-y += btrfs.h > -header-y += can.h > -header-y += capability.h > -header-y += capi.h > -header-y += cciss_defs.h > -header-y += cciss_ioctl.h > -header-y += cdrom.h > -header-y += cec.h > -header-y += cec-funcs.h > -header-y += cgroupstats.h > -header-y += chio.h > -header-y += cm4000_cs.h > -header-y += cn_proc.h > -header-y += coda.h > -header-y += coda_psdev.h > -header-y += coff.h > -header-y += connector.h > -header-y += const.h > -header-y += cramfs_fs.h > -header-y += cuda.h > -header-y += cyclades.h > -header-y += cycx_cfm.h > -header-y += dcbnl.h > -header-y += dccp.h > -header-y += devlink.h > -header-y += dlmconstants.h > -header-y += dlm_device.h > -header-y += dlm.h > -header-y += dlm_netlink.h > -header-y += dlm_plock.h > -header-y += dm-ioctl.h > -header-y += dm-log-userspace.h > -header-y += dn.h > -header-y += dqblk_xfs.h > -header-y += edd.h > -header-y += efs_fs_sb.h > -header-y += elfcore.h > -header-y += elf-em.h > -header-y += elf-fdpic.h > -header-y += elf.h > -header-y += errno.h > -header-y += errqueue.h > -header-y += ethtool.h > -header-y += eventpoll.h > -header-y += fadvise.h > -header-y += falloc.h > -header-y += fanotify.h > -header-y += fb.h > -header-y += fcntl.h > -header-y += fd.h > -header-y += fdreg.h > -header-y += fib_rules.h > -header-y += fiemap.h > -header-y += filter.h > -header-y += firewire-cdev.h > -header-y += firewire-constants.h > -header-y += flat.h > -header-y += fou.h > -header-y += fs.h > -header-y += fsl_hypervisor.h > -header-y += fuse.h > -header-y += futex.h > -header-y += gameport.h > -header-y += genetlink.h > -header-y += gen_stats.h > -header-y += gfs2_ondisk.h > -header-y += gigaset_dev.h > -header-y += gpio.h > -header-y += gsmmux.h > -header-y += gtp.h > -header-y += hdlcdrv.h > -header-y += hdlc.h > -header-y += hdreg.h > -header-y += hiddev.h > -header-y += hid.h > -header-y += hidraw.h > -header-y += hpet.h > -header-y += hsr_netlink.h > -header-y += hyperv.h > -header-y += hysdn_if.h > -header-y += i2c-dev.h > -header-y += i2c.h > -header-y += i2o-dev.h > -header-y += i8k.h > -header-y += icmp.h > -header-y += icmpv6.h > -header-y += if_addr.h > -header-y += if_addrlabel.h > -header-y += if_alg.h > -header-y += if_arcnet.h > -header-y += if_arp.h > -header-y += if_bonding.h > -header-y += if_bridge.h > -header-y += if_cablemodem.h > -header-y += if_eql.h > -header-y += if_ether.h > -header-y += if_fc.h > -header-y += if_fddi.h > -header-y += if_frad.h > -header-y += if.h > -header-y += if_hippi.h > -header-y += if_infiniband.h > -header-y += if_link.h > -header-y += if_ltalk.h > -header-y += if_macsec.h > -header-y += if_packet.h > -header-y += if_phonet.h > -header-y += if_plip.h > -header-y += if_ppp.h > -header-y += if_pppol2tp.h > -header-y += if_pppox.h > -header-y += if_slip.h > -header-y += if_team.h > -header-y += if_tun.h > -header-y += if_tunnel.h > -header-y += if_vlan.h > -header-y += if_x25.h > -header-y += igmp.h > -header-y += ila.h > -header-y += in6.h > -header-y += inet_diag.h > -header-y += in.h > -header-y += inotify.h > -header-y += input.h > -header-y += input-event-codes.h > -header-y += in_route.h > -header-y += ioctl.h > -header-y += ip6_tunnel.h > -header-y += ipc.h > -header-y += ip.h > -header-y += ipmi.h > -header-y += ipmi_msgdefs.h > -header-y += ipsec.h > -header-y += ipv6.h > -header-y += ipv6_route.h > -header-y += ip_vs.h > -header-y += ipx.h > -header-y += irda.h > -header-y += irqnr.h > -header-y += isdn_divertif.h > -header-y += isdn.h > -header-y += isdnif.h > -header-y += isdn_ppp.h > -header-y += iso_fs.h > -header-y += ivtvfb.h > -header-y += ivtv.h > -header-y += ixjuser.h > -header-y += jffs2.h > -header-y += joystick.h > -header-y += kcmp.h > -header-y += kdev_t.h > -header-y += kd.h > -header-y += kernelcapi.h > -header-y += kernel.h > -header-y += kernel-page-flags.h > -header-y += kexec.h > -header-y += keyboard.h > -header-y += keyctl.h > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) > -header-y += kvm.h > -endif > - > - > -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) > -header-y += kvm_para.h > -endif > - > -header-y += hw_breakpoint.h > -header-y += l2tp.h > -header-y += libc-compat.h > -header-y += lirc.h > -header-y += limits.h > -header-y += llc.h > -header-y += loop.h > -header-y += lp.h > -header-y += lwtunnel.h > -header-y += magic.h > -header-y += major.h > -header-y += map_to_7segment.h > -header-y += matroxfb.h > -header-y += mdio.h > -header-y += media.h > -header-y += media-bus-format.h > -header-y += mei.h > -header-y += membarrier.h > -header-y += memfd.h > -header-y += mempolicy.h > -header-y += meye.h > -header-y += mic_common.h > -header-y += mic_ioctl.h > -header-y += mii.h > -header-y += minix_fs.h > -header-y += mman.h > -header-y += mmtimer.h > -header-y += mpls.h > -header-y += mpls_iptunnel.h > -header-y += mqueue.h > -header-y += mroute6.h > -header-y += mroute.h > -header-y += msdos_fs.h > -header-y += msg.h > -header-y += mtio.h > -header-y += nbd.h > -header-y += ncp_fs.h > -header-y += ncp.h > -header-y += ncp_mount.h > -header-y += ncp_no.h > -header-y += ndctl.h > -header-y += neighbour.h > -header-y += netconf.h > -header-y += netdevice.h > -header-y += net_dropmon.h > -header-y += netfilter_arp.h > -header-y += netfilter_bridge.h > -header-y += netfilter_decnet.h > -header-y += netfilter.h > -header-y += netfilter_ipv4.h > -header-y += netfilter_ipv6.h > -header-y += net.h > -header-y += netlink_diag.h > -header-y += netlink.h > -header-y += netrom.h > -header-y += net_namespace.h > -header-y += net_tstamp.h > -header-y += nfc.h > -header-y += nfs2.h > -header-y += nfs3.h > -header-y += nfs4.h > -header-y += nfs4_mount.h > -header-y += nfsacl.h > -header-y += nfs_fs.h > -header-y += nfs.h > -header-y += nfs_idmap.h > -header-y += nfs_mount.h > -header-y += nl80211.h > -header-y += n_r3964.h > -header-y += nubus.h > -header-y += nvme_ioctl.h > -header-y += nvram.h > -header-y += omap3isp.h > -header-y += omapfb.h > -header-y += oom.h > -header-y += openvswitch.h > -header-y += packet_diag.h > -header-y += param.h > -header-y += parport.h > -header-y += patchkey.h > -header-y += pci.h > -header-y += pci_regs.h > -header-y += perf_event.h > -header-y += personality.h > -header-y += pfkeyv2.h > -header-y += pg.h > -header-y += phantom.h > -header-y += phonet.h > -header-y += pktcdvd.h > -header-y += pkt_cls.h > -header-y += pkt_sched.h > -header-y += pmu.h > -header-y += poll.h > -header-y += posix_acl.h > -header-y += posix_acl_xattr.h > -header-y += posix_types.h > -header-y += ppdev.h > -header-y += ppp-comp.h > -header-y += ppp_defs.h > -header-y += ppp-ioctl.h > -header-y += pps.h > -header-y += prctl.h > -header-y += psci.h > -header-y += ptp_clock.h > -header-y += ptrace.h > -header-y += qnx4_fs.h > -header-y += qnxtypes.h > -header-y += quota.h > -header-y += radeonfb.h > -header-y += random.h > -header-y += raw.h > -header-y += rds.h > -header-y += reboot.h > -header-y += reiserfs_fs.h > -header-y += reiserfs_xattr.h > -header-y += resource.h > -header-y += rfkill.h > -header-y += rio_cm_cdev.h > -header-y += rio_mport_cdev.h > -header-y += romfs_fs.h > -header-y += rose.h > -header-y += route.h > -header-y += rtc.h > -header-y += rtnetlink.h > -header-y += scc.h > -header-y += sched.h > -header-y += scif_ioctl.h > -header-y += screen_info.h > -header-y += sctp.h > -header-y += sdla.h > -header-y += seccomp.h > -header-y += securebits.h > -header-y += selinux_netlink.h > -header-y += sem.h > -header-y += serial_core.h > -header-y += serial.h > -header-y += serial_reg.h > -header-y += serio.h > -header-y += shm.h > -header-y += signalfd.h > -header-y += signal.h > -header-y += smiapp.h > -header-y += snmp.h > -header-y += sock_diag.h > -header-y += socket.h > -header-y += sockios.h > -header-y += sonet.h > -header-y += sonypi.h > -header-y += soundcard.h > -header-y += sound.h > -header-y += stat.h > -header-y += stddef.h > -header-y += string.h > -header-y += suspend_ioctls.h > -header-y += swab.h > -header-y += synclink.h > -header-y += sync_file.h > -header-y += sysctl.h > -header-y += sysinfo.h > -header-y += target_core_user.h > -header-y += taskstats.h > -header-y += tcp.h > -header-y += tcp_metrics.h > -header-y += telephony.h > -header-y += termios.h > -header-y += thermal.h > -header-y += time.h > -header-y += times.h > -header-y += timex.h > -header-y += tiocl.h > -header-y += tipc_config.h > -header-y += tipc_netlink.h > -header-y += tipc.h > -header-y += toshiba.h > -header-y += tty_flags.h > -header-y += tty.h > -header-y += types.h > -header-y += udf_fs_i.h > -header-y += udp.h > -header-y += uhid.h > -header-y += uinput.h > -header-y += uio.h > -header-y += uleds.h > -header-y += ultrasound.h > -header-y += un.h > -header-y += unistd.h > -header-y += unix_diag.h > -header-y += usbdevice_fs.h > -header-y += usbip.h > -header-y += utime.h > -header-y += utsname.h > -header-y += uuid.h > -header-y += uvcvideo.h > -header-y += v4l2-common.h > -header-y += v4l2-controls.h > -header-y += v4l2-dv-timings.h > -header-y += v4l2-mediabus.h > -header-y += v4l2-subdev.h > -header-y += veth.h > -header-y += vfio.h > -header-y += vhost.h > -header-y += videodev2.h > -header-y += virtio_9p.h > -header-y += virtio_balloon.h > -header-y += virtio_blk.h > -header-y += virtio_config.h > -header-y += virtio_console.h > -header-y += virtio_gpu.h > -header-y += virtio_ids.h > -header-y += virtio_input.h > -header-y += virtio_net.h > -header-y += virtio_pci.h > -header-y += virtio_ring.h > -header-y += virtio_rng.h > -header-y += virtio_scsi.h > -header-y += virtio_types.h > -header-y += virtio_vsock.h > -header-y += virtio_crypto.h > -header-y += vm_sockets.h > -header-y += vt.h > -header-y += vtpm_proxy.h > -header-y += wait.h > -header-y += wanrouter.h > -header-y += watchdog.h > -header-y += wimax.h > -header-y += wireless.h > -header-y += x25.h > -header-y += xattr.h > -header-y += xfrm.h > -header-y += xilinx-v4l2-controls.h > -header-y += zorro.h > -header-y += zorro_ids.h > -header-y += userfaultfd.h > diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild > deleted file mode 100644 > index ca011eec252a..000000000000 > --- a/include/uapi/linux/android/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += binder.h > diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild > deleted file mode 100644 > index 619225b9ff2e..000000000000 > --- a/include/uapi/linux/byteorder/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += big_endian.h > -header-y += little_endian.h > diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild > deleted file mode 100644 > index 43396612d3a3..000000000000 > --- a/include/uapi/linux/caif/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += caif_socket.h > -header-y += if_caif.h > diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild > deleted file mode 100644 > index 21c91bf25a29..000000000000 > --- a/include/uapi/linux/can/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += bcm.h > -header-y += error.h > -header-y += gw.h > -header-y += netlink.h > -header-y += raw.h > diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild > deleted file mode 100644 > index d40942cfc627..000000000000 > --- a/include/uapi/linux/dvb/Kbuild > +++ /dev/null > @@ -1,9 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += ca.h > -header-y += dmx.h > -header-y += frontend.h > -header-y += net.h > -header-y += osd.h > -header-y += version.h > -header-y += video.h > diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/hdlc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild > deleted file mode 100644 > index a16a00544258..000000000000 > --- a/include/uapi/linux/hsi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hsi_char.h cs-protocol.h > diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild > deleted file mode 100644 > index 86f76d84c44f..000000000000 > --- a/include/uapi/linux/iio/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += events.h > -header-y += types.h > diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild > deleted file mode 100644 > index 89e52850bf29..000000000000 > --- a/include/uapi/linux/isdn/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += capicmd.h > diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild > deleted file mode 100644 > index 8c1d2cb75e33..000000000000 > --- a/include/uapi/linux/mmc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += ioctl.h > diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild > deleted file mode 100644 > index 03f194aeadc5..000000000000 > --- a/include/uapi/linux/netfilter/Kbuild > +++ /dev/null > @@ -1,89 +0,0 @@ > -# UAPI Header export list > -header-y += ipset/ > -header-y += nf_conntrack_common.h > -header-y += nf_conntrack_ftp.h > -header-y += nf_conntrack_sctp.h > -header-y += nf_conntrack_tcp.h > -header-y += nf_conntrack_tuple_common.h > -header-y += nf_log.h > -header-y += nf_tables.h > -header-y += nf_tables_compat.h > -header-y += nf_nat.h > -header-y += nfnetlink.h > -header-y += nfnetlink_acct.h > -header-y += nfnetlink_compat.h > -header-y += nfnetlink_conntrack.h > -header-y += nfnetlink_cthelper.h > -header-y += nfnetlink_cttimeout.h > -header-y += nfnetlink_log.h > -header-y += nfnetlink_queue.h > -header-y += x_tables.h > -header-y += xt_AUDIT.h > -header-y += xt_CHECKSUM.h > -header-y += xt_CLASSIFY.h > -header-y += xt_CONNMARK.h > -header-y += xt_CONNSECMARK.h > -header-y += xt_CT.h > -header-y += xt_DSCP.h > -header-y += xt_HMARK.h > -header-y += xt_IDLETIMER.h > -header-y += xt_LED.h > -header-y += xt_LOG.h > -header-y += xt_MARK.h > -header-y += xt_NFLOG.h > -header-y += xt_NFQUEUE.h > -header-y += xt_RATEEST.h > -header-y += xt_SECMARK.h > -header-y += xt_SYNPROXY.h > -header-y += xt_TCPMSS.h > -header-y += xt_TCPOPTSTRIP.h > -header-y += xt_TEE.h > -header-y += xt_TPROXY.h > -header-y += xt_addrtype.h > -header-y += xt_bpf.h > -header-y += xt_cgroup.h > -header-y += xt_cluster.h > -header-y += xt_comment.h > -header-y += xt_connbytes.h > -header-y += xt_connlabel.h > -header-y += xt_connlimit.h > -header-y += xt_connmark.h > -header-y += xt_conntrack.h > -header-y += xt_cpu.h > -header-y += xt_dccp.h > -header-y += xt_devgroup.h > -header-y += xt_dscp.h > -header-y += xt_ecn.h > -header-y += xt_esp.h > -header-y += xt_hashlimit.h > -header-y += xt_helper.h > -header-y += xt_ipcomp.h > -header-y += xt_iprange.h > -header-y += xt_ipvs.h > -header-y += xt_l2tp.h > -header-y += xt_length.h > -header-y += xt_limit.h > -header-y += xt_mac.h > -header-y += xt_mark.h > -header-y += xt_multiport.h > -header-y += xt_nfacct.h > -header-y += xt_osf.h > -header-y += xt_owner.h > -header-y += xt_physdev.h > -header-y += xt_pkttype.h > -header-y += xt_policy.h > -header-y += xt_quota.h > -header-y += xt_rateest.h > -header-y += xt_realm.h > -header-y += xt_recent.h > -header-y += xt_rpfilter.h > -header-y += xt_sctp.h > -header-y += xt_set.h > -header-y += xt_socket.h > -header-y += xt_state.h > -header-y += xt_statistic.h > -header-y += xt_string.h > -header-y += xt_tcpmss.h > -header-y += xt_tcpudp.h > -header-y += xt_time.h > -header-y += xt_u32.h > diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild > deleted file mode 100644 > index d2680423d9ab..000000000000 > --- a/include/uapi/linux/netfilter/ipset/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += ip_set.h > -header-y += ip_set_bitmap.h > -header-y += ip_set_hash.h > -header-y += ip_set_list.h > diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild > deleted file mode 100644 > index 62d5637cc0ac..000000000000 > --- a/include/uapi/linux/netfilter_arp/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += arp_tables.h > -header-y += arpt_mangle.h > diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild > deleted file mode 100644 > index 0fbad8ef96de..000000000000 > --- a/include/uapi/linux/netfilter_bridge/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ebt_802_3.h > -header-y += ebt_among.h > -header-y += ebt_arp.h > -header-y += ebt_arpreply.h > -header-y += ebt_ip.h > -header-y += ebt_ip6.h > -header-y += ebt_limit.h > -header-y += ebt_log.h > -header-y += ebt_mark_m.h > -header-y += ebt_mark_t.h > -header-y += ebt_nat.h > -header-y += ebt_nflog.h > -header-y += ebt_pkttype.h > -header-y += ebt_redirect.h > -header-y += ebt_stp.h > -header-y += ebt_vlan.h > -header-y += ebtables.h > diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild > deleted file mode 100644 > index ecb291df390e..000000000000 > --- a/include/uapi/linux/netfilter_ipv4/Kbuild > +++ /dev/null > @@ -1,10 +0,0 @@ > -# UAPI Header export list > -header-y += ip_tables.h > -header-y += ipt_CLUSTERIP.h > -header-y += ipt_ECN.h > -header-y += ipt_LOG.h > -header-y += ipt_REJECT.h > -header-y += ipt_TTL.h > -header-y += ipt_ah.h > -header-y += ipt_ecn.h > -header-y += ipt_ttl.h > diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild > deleted file mode 100644 > index 75a668ca2353..000000000000 > --- a/include/uapi/linux/netfilter_ipv6/Kbuild > +++ /dev/null > @@ -1,13 +0,0 @@ > -# UAPI Header export list > -header-y += ip6_tables.h > -header-y += ip6t_HL.h > -header-y += ip6t_LOG.h > -header-y += ip6t_NPT.h > -header-y += ip6t_REJECT.h > -header-y += ip6t_ah.h > -header-y += ip6t_frag.h > -header-y += ip6t_hl.h > -header-y += ip6t_ipv6header.h > -header-y += ip6t_mh.h > -header-y += ip6t_opts.h > -header-y += ip6t_rt.h > diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild > deleted file mode 100644 > index c11bc404053c..000000000000 > --- a/include/uapi/linux/nfsd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += cld.h > -header-y += debug.h > -header-y += export.h > -header-y += nfsfh.h > -header-y += stats.h > diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild > deleted file mode 100644 > index e2c3d25405d7..000000000000 > --- a/include/uapi/linux/raid/Kbuild > +++ /dev/null > @@ -1,3 +0,0 @@ > -# UAPI Header export list > -header-y += md_p.h > -header-y += md_u.h > diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild > deleted file mode 100644 > index 0cc747eff165..000000000000 > --- a/include/uapi/linux/spi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += spidev.h > diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild > deleted file mode 100644 > index 8e02e47c20fb..000000000000 > --- a/include/uapi/linux/sunrpc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += debug.h > diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild > deleted file mode 100644 > index e3db7403296f..000000000000 > --- a/include/uapi/linux/tc_act/Kbuild > +++ /dev/null > @@ -1,15 +0,0 @@ > -# UAPI Header export list > -header-y += tc_csum.h > -header-y += tc_defact.h > -header-y += tc_gact.h > -header-y += tc_ipt.h > -header-y += tc_mirred.h > -header-y += tc_nat.h > -header-y += tc_pedit.h > -header-y += tc_skbedit.h > -header-y += tc_vlan.h > -header-y += tc_bpf.h > -header-y += tc_connmark.h > -header-y += tc_ife.h > -header-y += tc_tunnel_key.h > -header-y += tc_skbmod.h > diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild > deleted file mode 100644 > index 53fca3925535..000000000000 > --- a/include/uapi/linux/tc_ematch/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += tc_em_cmp.h > -header-y += tc_em_meta.h > -header-y += tc_em_nbyte.h > -header-y += tc_em_text.h > diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild > deleted file mode 100644 > index 4cc4d6e7e523..000000000000 > --- a/include/uapi/linux/usb/Kbuild > +++ /dev/null > @@ -1,12 +0,0 @@ > -# UAPI Header export list > -header-y += audio.h > -header-y += cdc.h > -header-y += cdc-wdm.h > -header-y += ch11.h > -header-y += ch9.h > -header-y += functionfs.h > -header-y += g_printer.h > -header-y += gadgetfs.h > -header-y += midi.h > -header-y += tmc.h > -header-y += video.h > diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild > deleted file mode 100644 > index 1c97be49971f..000000000000 > --- a/include/uapi/linux/wimax/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += i2400m.h > diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild > deleted file mode 100644 > index e96cae7d58c9..000000000000 > --- a/include/uapi/misc/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# misc Header export list > -header-y += cxl.h > diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild > deleted file mode 100644 > index 5a691e10cd0e..000000000000 > --- a/include/uapi/mtd/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += inftl-user.h > -header-y += mtd-abi.h > -header-y += mtd-user.h > -header-y += nftl-user.h > -header-y += ubi-user.h > diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild > deleted file mode 100644 > index 82bdf5626859..000000000000 > --- a/include/uapi/rdma/Kbuild > +++ /dev/null > @@ -1,18 +0,0 @@ > -# UAPI Header export list > -header-y += ib_user_cm.h > -header-y += ib_user_mad.h > -header-y += ib_user_sa.h > -header-y += ib_user_verbs.h > -header-y += rdma_netlink.h > -header-y += rdma_user_cm.h > -header-y += hfi/ > -header-y += rdma_user_rxe.h > -header-y += cxgb3-abi.h > -header-y += cxgb4-abi.h > -header-y += mlx4-abi.h > -header-y += mlx5-abi.h > -header-y += mthca-abi.h > -header-y += nes-abi.h > -header-y += ocrdma-abi.h > -header-y += hns-abi.h > -header-y += vmw_pvrdma-abi.h > diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild > deleted file mode 100644 > index ef23c294fc71..000000000000 > --- a/include/uapi/rdma/hfi/Kbuild > +++ /dev/null > @@ -1,2 +0,0 @@ > -# UAPI Header export list > -header-y += hfi1_user.h > diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild > deleted file mode 100644 > index d791e0ad509d..000000000000 > --- a/include/uapi/scsi/Kbuild > +++ /dev/null > @@ -1,6 +0,0 @@ > -# UAPI Header export list > -header-y += fc/ > -header-y += scsi_bsg_fc.h > -header-y += scsi_netlink.h > -header-y += scsi_netlink_fc.h > -header-y += cxlflash_ioctl.h > diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild > deleted file mode 100644 > index 5ead9fac265c..000000000000 > --- a/include/uapi/scsi/fc/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += fc_els.h > -header-y += fc_fs.h > -header-y += fc_gs.h > -header-y += fc_ns.h > diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild > deleted file mode 100644 > index 9578d8bdbf31..000000000000 > --- a/include/uapi/sound/Kbuild > +++ /dev/null > @@ -1,16 +0,0 @@ > -# UAPI Header export list > -header-y += asequencer.h > -header-y += asoc.h > -header-y += asound.h > -header-y += asound_fm.h > -header-y += compress_offload.h > -header-y += compress_params.h > -header-y += emu10k1.h > -header-y += firewire.h > -header-y += hdsp.h > -header-y += hdspm.h > -header-y += sb16_csp.h > -header-y += sfnt_info.h > -header-y += tlv.h > -header-y += usb_stream.h > -header-y += snd_sst_tokens.h > diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild > deleted file mode 100644 > index ac7203bb32cc..000000000000 > --- a/include/uapi/video/Kbuild > +++ /dev/null > @@ -1,4 +0,0 @@ > -# UAPI Header export list > -header-y += edid.h > -header-y += sisfb.h > -header-y += uvesafb.h > diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild > deleted file mode 100644 > index 5c459628e8c7..000000000000 > --- a/include/uapi/xen/Kbuild > +++ /dev/null > @@ -1,5 +0,0 @@ > -# UAPI Header export list > -header-y += evtchn.h > -header-y += gntalloc.h > -header-y += gntdev.h > -header-y += privcmd.h > diff --git a/include/video/Kbuild b/include/video/Kbuild > deleted file mode 100644 > index e69de29bb2d1..000000000000 > diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst > index 876b42cfede4..bb93f8466a35 100644 > --- a/scripts/Makefile.headersinst > +++ b/scripts/Makefile.headersinst > @@ -1,17 +1,18 @@ > # ========================================================================== > # Installing headers > # > -# header-y - list files to be installed. They are preprocessed > -# to remove __KERNEL__ section of the file > -# genhdr-y - Same as header-y but in a generated/ directory > +# All headers under include/uapi, include/generated/uapi, > +# arch/<arch>/include/uapi/asm and /include/generated/uapi/asm are exported. > +# They are preprocessed to remove __KERNEL__ section of the file. > # > # ========================================================================== > > # generated header directory > gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) > > +# Kbuild file is optional > kbuild-file := $(srctree)/$(obj)/Kbuild > -include $(kbuild-file) > +-include $(kbuild-file) > > # called may set destination dir (when installing to asm/) > _dst := $(if $(dst),$(dst),$(obj)) > @@ -25,9 +26,12 @@ include scripts/Kbuild.include > > installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) > > -header-y := $(sort $(header-y)) > -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) > -header-y := $(filter-out %/, $(header-y)) > +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) > +subdirs += $(subdir-y) > +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) > +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) > +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) > +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) > > # files used to track state of install/check > install-file := $(installdir)/.install > @@ -35,26 +39,17 @@ check-file := $(installdir)/.check > > # generic-y list all files an architecture uses from asm-generic > # Use this to build a list of headers which require a wrapper > -wrapper-files := $(filter $(header-y), $(generic-y)) > +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) > +wrapper-files := $(filter $(generic-files), $(generic-y)) > +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) > > srcdir := $(srctree)/$(obj) > gendir := $(objtree)/$(gen) > > # all headers files for this dir > -header-y := $(filter-out $(generic-y), $(header-y)) > -all-files := $(header-y) $(genhdr-y) $(wrapper-files) > +all-files := $(header-files) $(genhdr-files) $(wrapper-files) > output-files := $(addprefix $(installdir)/, $(all-files)) > > -# Check that all expected files exist > -$(foreach hdr, $(header-y), \ > - $(if $(wildcard $(srcdir)/$(hdr)),, \ > - $(error Missing UAPI file $(srcdir)/$(hdr)) \ > - )) > -$(foreach hdr, $(genhdr-y), \ > - $(if $(wildcard $(gendir)/$(hdr)),, \ > - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ > - )) > - > # Work out what needs to be removed > oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) > unwanted := $(filter-out $(all-files),$(oldheaders)) > @@ -67,8 +62,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) > quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ > file$(if $(word 2, $(all-files)),s)) > cmd_install = \ > - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ > - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ > + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ > + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ > for F in $(wrapper-files); do \ > echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ > done; \ _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 0/7] uapi: export all headers under uapi directories 2017-01-06 9:43 ` Nicolas Dichtel ` (21 preceding siblings ...) (?) @ 2017-01-09 11:33 ` Arnd Bergmann -1 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > Here is the v2 of this series. The first 5 patches are just cleanup: some > exported headers were still under a non-uapi directory. Since this is meant as a cleanup, I commented on this to point out a cleaner way to do the same. > The patch 6 was spotted by code review: there is no in-tree user of this > functionality. > The last patch remove the use of header-y. Now all files under an uapi > directory are exported. Very nice! > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > only, but there is two exceptions: > - cris which exports arch/cris/include/uapi/arch-v[10|32]; This is interesting, though not your problem. Maybe someone who understands cris better can comment on this: How is the decision made about which of the arch/user.h headers gets used? I couldn't find that in the sources, but it appears to be based on kernel compile-time settings, which is wrong for user space header files that should be independent of the kernel config. > - tile which exports arch/tile/include/uapi/arch. > Because I don't know if the output of 'make headers_install_all' can be changed, > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > output of 'make headers_install_all' to export asm headers in > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > everything under arch/<arch>/include/uapi/. I don't know if anyone still uses "make headers_install_all", I suspect distros these days all use "make headers_install", so it probably doesn't matter much. In case of cris, it should be easy enough to move all the contents of the uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they only seem to be referenced from there. For tile, I suspect that would not work as the arch/*.h headers are apparently defined as interfaces for both user space and kernel. > Note also that exported files for asm are a mix of files listed by: > - include/uapi/asm-generic/Kbuild.asm; > - arch/x86/include/uapi/asm/Kbuild; > - arch/x86/include/asm/Kbuild. > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > used by scripts/Makefile.asm-generic). > > This series has been tested with a 'make headers_install' on x86 and a > 'make headers_install_all'. I've checked the result of both commands. > > This patch is built against linus tree. I don't know if it should be > made against antoher tree. The series should probably get merged through the kbuild tree, but testing it on mainline is fine here. Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 0/7] uapi: export all headers under uapi directories 2017-01-06 9:43 ` Nicolas Dichtel ` (22 preceding siblings ...) (?) @ 2017-01-09 11:33 ` Arnd Bergmann -1 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-metag, linux-arm-kernel On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > Here is the v2 of this series. The first 5 patches are just cleanup: some > exported headers were still under a non-uapi directory. Since this is meant as a cleanup, I commented on this to point out a cleaner way to do the same. > The patch 6 was spotted by code review: there is no in-tree user of this > functionality. > The last patch remove the use of header-y. Now all files under an uapi > directory are exported. Very nice! > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > only, but there is two exceptions: > - cris which exports arch/cris/include/uapi/arch-v[10|32]; This is interesting, though not your problem. Maybe someone who understands cris better can comment on this: How is the decision made about which of the arch/user.h headers gets used? I couldn't find that in the sources, but it appears to be based on kernel compile-time settings, which is wrong for user space header files that should be independent of the kernel config. > - tile which exports arch/tile/include/uapi/arch. > Because I don't know if the output of 'make headers_install_all' can be changed, > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > output of 'make headers_install_all' to export asm headers in > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > everything under arch/<arch>/include/uapi/. I don't know if anyone still uses "make headers_install_all", I suspect distros these days all use "make headers_install", so it probably doesn't matter much. In case of cris, it should be easy enough to move all the contents of the uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they only seem to be referenced from there. For tile, I suspect that would not work as the arch/*.h headers are apparently defined as interfaces for both user space and kernel. > Note also that exported files for asm are a mix of files listed by: > - include/uapi/asm-generic/Kbuild.asm; > - arch/x86/include/uapi/asm/Kbuild; > - arch/x86/include/asm/Kbuild. > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > used by scripts/Makefile.asm-generic). > > This series has been tested with a 'make headers_install' on x86 and a > 'make headers_install_all'. I've checked the result of both commands. > > This patch is built against linus tree. I don't know if it should be > made against antoher tree. The series should probably get merged through the kbuild tree, but testing it on mainline is fine here. Arnd _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 0/7] uapi: export all headers under uapi directories 2017-01-06 9:43 ` Nicolas Dichtel ` (5 preceding siblings ...) (?) @ 2017-01-09 11:33 ` Arnd Bergmann -1 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-metag, linux-arm-kernel On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > Here is the v2 of this series. The first 5 patches are just cleanup: some > exported headers were still under a non-uapi directory. Since this is meant as a cleanup, I commented on this to point out a cleaner way to do the same. > The patch 6 was spotted by code review: there is no in-tree user of this > functionality. > The last patch remove the use of header-y. Now all files under an uapi > directory are exported. Very nice! > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > only, but there is two exceptions: > - cris which exports arch/cris/include/uapi/arch-v[10|32]; This is interesting, though not your problem. Maybe someone who understands cris better can comment on this: How is the decision made about which of the arch/user.h headers gets used? I couldn't find that in the sources, but it appears to be based on kernel compile-time settings, which is wrong for user space header files that should be independent of the kernel config. > - tile which exports arch/tile/include/uapi/arch. > Because I don't know if the output of 'make headers_install_all' can be changed, > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > output of 'make headers_install_all' to export asm headers in > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > everything under arch/<arch>/include/uapi/. I don't know if anyone still uses "make headers_install_all", I suspect distros these days all use "make headers_install", so it probably doesn't matter much. In case of cris, it should be easy enough to move all the contents of the uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they only seem to be referenced from there. For tile, I suspect that would not work as the arch/*.h headers are apparently defined as interfaces for both user space and kernel. > Note also that exported files for asm are a mix of files listed by: > - include/uapi/asm-generic/Kbuild.asm; > - arch/x86/include/uapi/asm/Kbuild; > - arch/x86/include/asm/Kbuild. > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > used by scripts/Makefile.asm-generic). > > This series has been tested with a 'make headers_install' on x86 and a > 'make headers_install_all'. I've checked the result of both commands. > > This patch is built against linus tree. I don't know if it should be > made against antoher tree. The series should probably get merged through the kbuild tree, but testing it on mainline is fine here. Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: openrisc On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > Here is the v2 of this series. The first 5 patches are just cleanup: some > exported headers were still under a non-uapi directory. Since this is meant as a cleanup, I commented on this to point out a cleaner way to do the same. > The patch 6 was spotted by code review: there is no in-tree user of this > functionality. > The last patch remove the use of header-y. Now all files under an uapi > directory are exported. Very nice! > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > only, but there is two exceptions: > - cris which exports arch/cris/include/uapi/arch-v[10|32]; This is interesting, though not your problem. Maybe someone who understands cris better can comment on this: How is the decision made about which of the arch/user.h headers gets used? I couldn't find that in the sources, but it appears to be based on kernel compile-time settings, which is wrong for user space header files that should be independent of the kernel config. > - tile which exports arch/tile/include/uapi/arch. > Because I don't know if the output of 'make headers_install_all' can be changed, > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > output of 'make headers_install_all' to export asm headers in > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > everything under arch/<arch>/include/uapi/. I don't know if anyone still uses "make headers_install_all", I suspect distros these days all use "make headers_install", so it probably doesn't matter much. In case of cris, it should be easy enough to move all the contents of the uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they only seem to be referenced from there. For tile, I suspect that would not work as the arch/*.h headers are apparently defined as interfaces for both user space and kernel. > Note also that exported files for asm are a mix of files listed by: > - include/uapi/asm-generic/Kbuild.asm; > - arch/x86/include/uapi/asm/Kbuild; > - arch/x86/include/asm/Kbuild. > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > used by scripts/Makefile.asm-generic). > > This series has been tested with a 'make headers_install' on x86 and a > 'make headers_install_all'. I've checked the result of both commands. > > This patch is built against linus tree. I don't know if it should be > made against antoher tree. The series should probably get merged through the kbuild tree, but testing it on mainline is fine here. Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linux-arm-kernel On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > Here is the v2 of this series. The first 5 patches are just cleanup: some > exported headers were still under a non-uapi directory. Since this is meant as a cleanup, I commented on this to point out a cleaner way to do the same. > The patch 6 was spotted by code review: there is no in-tree user of this > functionality. > The last patch remove the use of header-y. Now all files under an uapi > directory are exported. Very nice! > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > only, but there is two exceptions: > - cris which exports arch/cris/include/uapi/arch-v[10|32]; This is interesting, though not your problem. Maybe someone who understands cris better can comment on this: How is the decision made about which of the arch/user.h headers gets used? I couldn't find that in the sources, but it appears to be based on kernel compile-time settings, which is wrong for user space header files that should be independent of the kernel config. > - tile which exports arch/tile/include/uapi/arch. > Because I don't know if the output of 'make headers_install_all' can be changed, > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > output of 'make headers_install_all' to export asm headers in > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > everything under arch/<arch>/include/uapi/. I don't know if anyone still uses "make headers_install_all", I suspect distros these days all use "make headers_install", so it probably doesn't matter much. In case of cris, it should be easy enough to move all the contents of the uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they only seem to be referenced from there. For tile, I suspect that would not work as the arch/*.h headers are apparently defined as interfaces for both user space and kernel. > Note also that exported files for asm are a mix of files listed by: > - include/uapi/asm-generic/Kbuild.asm; > - arch/x86/include/uapi/asm/Kbuild; > - arch/x86/include/asm/Kbuild. > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > used by scripts/Makefile.asm-generic). > > This series has been tested with a 'make headers_install' on x86 and a > 'make headers_install_all'. I've checked the result of both commands. > > This patch is built against linus tree. I don't know if it should be > made against antoher tree. The series should probably get merged through the kbuild tree, but testing it on mainline is fine here. Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linux-snps-arc On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > Here is the v2 of this series. The first 5 patches are just cleanup: some > exported headers were still under a non-uapi directory. Since this is meant as a cleanup, I commented on this to point out a cleaner way to do the same. > The patch 6 was spotted by code review: there is no in-tree user of this > functionality. > The last patch remove the use of header-y. Now all files under an uapi > directory are exported. Very nice! > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > only, but there is two exceptions: > - cris which exports arch/cris/include/uapi/arch-v[10|32]; This is interesting, though not your problem. Maybe someone who understands cris better can comment on this: How is the decision made about which of the arch/user.h headers gets used? I couldn't find that in the sources, but it appears to be based on kernel compile-time settings, which is wrong for user space header files that should be independent of the kernel config. > - tile which exports arch/tile/include/uapi/arch. > Because I don't know if the output of 'make headers_install_all' can be changed, > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > output of 'make headers_install_all' to export asm headers in > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > everything under arch/<arch>/include/uapi/. I don't know if anyone still uses "make headers_install_all", I suspect distros these days all use "make headers_install", so it probably doesn't matter much. In case of cris, it should be easy enough to move all the contents of the uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they only seem to be referenced from there. For tile, I suspect that would not work as the arch/*.h headers are apparently defined as interfaces for both user space and kernel. > Note also that exported files for asm are a mix of files listed by: > - include/uapi/asm-generic/Kbuild.asm; > - arch/x86/include/uapi/asm/Kbuild; > - arch/x86/include/asm/Kbuild. > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > used by scripts/Makefile.asm-generic). > > This series has been tested with a 'make headers_install' on x86 and a > 'make headers_install_all'. I've checked the result of both commands. > > This patch is built against linus tree. I don't know if it should be > made against antoher tree. The series should probably get merged through the kbuild tree, but testing it on mainline is fine here. Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm-kernel, linux-nfs, linux-parisc, linux-cris-kernel, netdev, linux-mmc, linux-kernel, linux-spi, mmarek, netfilter-devel, linux-alpha, nios2-dev, davem On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > Here is the v2 of this series. The first 5 patches are just cleanup: some > exported headers were still under a non-uapi directory. Since this is meant as a cleanup, I commented on this to point out a cleaner way to do the same. > The patch 6 was spotted by code review: there is no in-tree user of this > functionality. > The last patch remove the use of header-y. Now all files under an uapi > directory are exported. Very nice! > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > only, but there is two exceptions: > - cris which exports arch/cris/include/uapi/arch-v[10|32]; This is interesting, though not your problem. Maybe someone who understands cris better can comment on this: How is the decision made about which of the arch/user.h headers gets used? I couldn't find that in the sources, but it appears to be based on kernel compile-time settings, which is wrong for user space header files that should be independent of the kernel config. > - tile which exports arch/tile/include/uapi/arch. > Because I don't know if the output of 'make headers_install_all' can be changed, > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > output of 'make headers_install_all' to export asm headers in > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > everything under arch/<arch>/include/uapi/. I don't know if anyone still uses "make headers_install_all", I suspect distros these days all use "make headers_install", so it probably doesn't matter much. In case of cris, it should be easy enough to move all the contents of the uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they only seem to be referenced from there. For tile, I suspect that would not work as the arch/*.h headers are apparently defined as interfaces for both user space and kernel. > Note also that exported files for asm are a mix of files listed by: > - include/uapi/asm-generic/Kbuild.asm; > - arch/x86/include/uapi/asm/Kbuild; > - arch/x86/include/asm/Kbuild. > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > used by scripts/Makefile.asm-generic). > > This series has been tested with a 'make headers_install' on x86 and a > 'make headers_install_all'. I've checked the result of both commands. > > This patch is built against linus tree. I don't know if it should be > made against antoher tree. The series should probably get merged through the kbuild tree, but testing it on mainline is fine here. Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm-kernel, linux-nfs, linux-parisc, linux-cris-kernel, netdev, linux-mmc, linux-kernel, linux-spi, mmarek, netfilter-devel, linux-alpha, nios2-dev, davem On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > Here is the v2 of this series. The first 5 patches are just cleanup: some > exported headers were still under a non-uapi directory. Since this is meant as a cleanup, I commented on this to point out a cleaner way to do the same. > The patch 6 was spotted by code review: there is no in-tree user of this > functionality. > The last patch remove the use of header-y. Now all files under an uapi > directory are exported. Very nice! > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > only, but there is two exceptions: > - cris which exports arch/cris/include/uapi/arch-v[10|32]; This is interesting, though not your problem. Maybe someone who understands cris better can comment on this: How is the decision made about which of the arch/user.h headers gets used? I couldn't find that in the sources, but it appears to be based on kernel compile-time settings, which is wrong for user space header files that should be independent of the kernel config. > - tile which exports arch/tile/include/uapi/arch. > Because I don't know if the output of 'make headers_install_all' can be changed, > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > output of 'make headers_install_all' to export asm headers in > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > everything under arch/<arch>/include/uapi/. I don't know if anyone still uses "make headers_install_all", I suspect distros these days all use "make headers_install", so it probably doesn't matter much. In case of cris, it should be easy enough to move all the contents of the uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they only seem to be referenced from there. For tile, I suspect that would not work as the arch/*.h headers are apparently defined as interfaces for both user space and kernel. > Note also that exported files for asm are a mix of files listed by: > - include/uapi/asm-generic/Kbuild.asm; > - arch/x86/include/uapi/asm/Kbuild; > - arch/x86/include/asm/Kbuild. > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > used by scripts/Makefile.asm-generic). > > This series has been tested with a 'make headers_install' on x86 and a > 'make headers_install_all'. I've checked the result of both commands. > > This patch is built against linus tree. I don't know if it should be > made against antoher tree. The series should probably get merged through the kbuild tree, but testing it on mainline is fine here. Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-metag, linux-arm-kernel, li On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > Here is the v2 of this series. The first 5 patches are just cleanup: some > exported headers were still under a non-uapi directory. Since this is meant as a cleanup, I commented on this to point out a cleaner way to do the same. > The patch 6 was spotted by code review: there is no in-tree user of this > functionality. > The last patch remove the use of header-y. Now all files under an uapi > directory are exported. Very nice! > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > only, but there is two exceptions: > - cris which exports arch/cris/include/uapi/arch-v[10|32]; This is interesting, though not your problem. Maybe someone who understands cris better can comment on this: How is the decision made about which of the arch/user.h headers gets used? I couldn't find that in the sources, but it appears to be based on kernel compile-time settings, which is wrong for user space header files that should be independent of the kernel config. > - tile which exports arch/tile/include/uapi/arch. > Because I don't know if the output of 'make headers_install_all' can be changed, > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > output of 'make headers_install_all' to export asm headers in > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > everything under arch/<arch>/include/uapi/. I don't know if anyone still uses "make headers_install_all", I suspect distros these days all use "make headers_install", so it probably doesn't matter much. In case of cris, it should be easy enough to move all the contents of the uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they only seem to be referenced from there. For tile, I suspect that would not work as the arch/*.h headers are apparently defined as interfaces for both user space and kernel. > Note also that exported files for asm are a mix of files listed by: > - include/uapi/asm-generic/Kbuild.asm; > - arch/x86/include/uapi/asm/Kbuild; > - arch/x86/include/asm/Kbuild. > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > used by scripts/Makefile.asm-generic). > > This series has been tested with a 'make headers_install' on x86 and a > 'make headers_install_all'. I've checked the result of both commands. > > This patch is built against linus tree. I don't know if it should be > made against antoher tree. The series should probably get merged through the kbuild tree, but testing it on mainline is fine here. Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-09 11:33 ` Arnd Bergmann 0 siblings, 0 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-01-09 11:33 UTC (permalink / raw) To: linuxppc-dev, linux-kbuild Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-metag, linux-arm-kernel On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > Here is the v2 of this series. The first 5 patches are just cleanup: some > exported headers were still under a non-uapi directory. Since this is meant as a cleanup, I commented on this to point out a cleaner way to do the same. > The patch 6 was spotted by code review: there is no in-tree user of this > functionality. > The last patch remove the use of header-y. Now all files under an uapi > directory are exported. Very nice! > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > only, but there is two exceptions: > - cris which exports arch/cris/include/uapi/arch-v[10|32]; This is interesting, though not your problem. Maybe someone who understands cris better can comment on this: How is the decision made about which of the arch/user.h headers gets used? I couldn't find that in the sources, but it appears to be based on kernel compile-time settings, which is wrong for user space header files that should be independent of the kernel config. > - tile which exports arch/tile/include/uapi/arch. > Because I don't know if the output of 'make headers_install_all' can be changed, > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > output of 'make headers_install_all' to export asm headers in > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > everything under arch/<arch>/include/uapi/. I don't know if anyone still uses "make headers_install_all", I suspect distros these days all use "make headers_install", so it probably doesn't matter much. In case of cris, it should be easy enough to move all the contents of the uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they only seem to be referenced from there. For tile, I suspect that would not work as the arch/*.h headers are apparently defined as interfaces for both user space and kernel. > Note also that exported files for asm are a mix of files listed by: > - include/uapi/asm-generic/Kbuild.asm; > - arch/x86/include/uapi/asm/Kbuild; > - arch/x86/include/asm/Kbuild. > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > used by scripts/Makefile.asm-generic). > > This series has been tested with a 'make headers_install' on x86 and a > 'make headers_install_all'. I've checked the result of both commands. > > This patch is built against linus tree. I don't know if it should be > made against antoher tree. The series should probably get merged through the kbuild tree, but testing it on mainline is fine here. Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 0/7] uapi: export all headers under uapi directories 2017-01-09 11:33 ` Arnd Bergmann ` (6 preceding siblings ...) (?) @ 2017-01-11 12:42 ` Jesper Nilsson -1 siblings, 0 replies; 554+ messages in thread From: Jesper Nilsson @ 2017-01-11 12:42 UTC (permalink / raw) To: Arnd Bergmann Cc: linuxppc-dev, linux-kbuild, Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel On Mon, Jan 09, 2017 at 12:33:58PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > > Here is the v2 of this series. The first 5 patches are just cleanup: some > > exported headers were still under a non-uapi directory. > > Since this is meant as a cleanup, I commented on this to point out a cleaner > way to do the same. > > > The patch 6 was spotted by code review: there is no in-tree user of this > > functionality. > > The last patch remove the use of header-y. Now all files under an uapi > > directory are exported. > > Very nice! > > > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > > only, but there is two exceptions: > > - cris which exports arch/cris/include/uapi/arch-v[10|32]; > > This is interesting, though not your problem. Maybe someone who understands > cris better can comment on this: How is the decision made about which of > the arch/user.h headers gets used? I couldn't find that in the sources, > but it appears to be based on kernel compile-time settings, which is > wrong for user space header files that should be independent of the kernel > config. I believe it's since the CRISv10 and CRISv32 are very different beasts, and that is selected via kernel config... This part of the CRIS port has been transformed a couple of times from the original layout without uapi, and there's still some legacy silliness, where some files might have been exported but never used from userspace except for some corner cases. > > - tile which exports arch/tile/include/uapi/arch. > > Because I don't know if the output of 'make headers_install_all' can be changed, > > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > > output of 'make headers_install_all' to export asm headers in > > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > > everything under arch/<arch>/include/uapi/. > > I don't know if anyone still uses "make headers_install_all", I suspect > distros these days all use "make headers_install", so it probably > doesn't matter much. > > In case of cris, it should be easy enough to move all the contents of the > uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they > only seem to be referenced from there. This would seem to be a reasonable change. > For tile, I suspect that would not work as the arch/*.h headers are > apparently defined as interfaces for both user space and kernel. > > > Note also that exported files for asm are a mix of files listed by: > > - include/uapi/asm-generic/Kbuild.asm; > > - arch/x86/include/uapi/asm/Kbuild; > > - arch/x86/include/asm/Kbuild. > > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > > used by scripts/Makefile.asm-generic). > > > > This series has been tested with a 'make headers_install' on x86 and a > > 'make headers_install_all'. I've checked the result of both commands. > > > > This patch is built against linus tree. I don't know if it should be > > made against antoher tree. > > The series should probably get merged through the kbuild tree, but testing > it on mainline is fine here. > > Arnd /^JN - Jesper Nilsson -- Jesper Nilsson -- jesper.nilsson@axis.com ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 0/7] uapi: export all headers under uapi directories 2017-01-09 11:33 ` Arnd Bergmann ` (5 preceding siblings ...) (?) @ 2017-01-11 12:42 ` Jesper Nilsson -1 siblings, 0 replies; 554+ messages in thread From: Jesper Nilsson @ 2017-01-11 12:42 UTC (permalink / raw) To: Arnd Bergmann Cc: linuxppc-dev, linux-kbuild, Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel On Mon, Jan 09, 2017 at 12:33:58PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > > Here is the v2 of this series. The first 5 patches are just cleanup: some > > exported headers were still under a non-uapi directory. > > Since this is meant as a cleanup, I commented on this to point out a cleaner > way to do the same. > > > The patch 6 was spotted by code review: there is no in-tree user of this > > functionality. > > The last patch remove the use of header-y. Now all files under an uapi > > directory are exported. > > Very nice! > > > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > > only, but there is two exceptions: > > - cris which exports arch/cris/include/uapi/arch-v[10|32]; > > This is interesting, though not your problem. Maybe someone who understands > cris better can comment on this: How is the decision made about which of > the arch/user.h headers gets used? I couldn't find that in the sources, > but it appears to be based on kernel compile-time settings, which is > wrong for user space header files that should be independent of the kernel > config. I believe it's since the CRISv10 and CRISv32 are very different beasts, and that is selected via kernel config... This part of the CRIS port has been transformed a couple of times from the original layout without uapi, and there's still some legacy silliness, where some files might have been exported but never used from userspace except for some corner cases. > > - tile which exports arch/tile/include/uapi/arch. > > Because I don't know if the output of 'make headers_install_all' can be changed, > > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > > output of 'make headers_install_all' to export asm headers in > > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > > everything under arch/<arch>/include/uapi/. > > I don't know if anyone still uses "make headers_install_all", I suspect > distros these days all use "make headers_install", so it probably > doesn't matter much. > > In case of cris, it should be easy enough to move all the contents of the > uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they > only seem to be referenced from there. This would seem to be a reasonable change. > For tile, I suspect that would not work as the arch/*.h headers are > apparently defined as interfaces for both user space and kernel. > > > Note also that exported files for asm are a mix of files listed by: > > - include/uapi/asm-generic/Kbuild.asm; > > - arch/x86/include/uapi/asm/Kbuild; > > - arch/x86/include/asm/Kbuild. > > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > > used by scripts/Makefile.asm-generic). > > > > This series has been tested with a 'make headers_install' on x86 and a > > 'make headers_install_all'. I've checked the result of both commands. > > > > This patch is built against linus tree. I don't know if it should be > > made against antoher tree. > > The series should probably get merged through the kbuild tree, but testing > it on mainline is fine here. > > Arnd /^JN - Jesper Nilsson -- Jesper Nilsson -- jesper.nilsson@axis.com ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-11 12:42 ` Jesper Nilsson 0 siblings, 0 replies; 554+ messages in thread From: Jesper Nilsson @ 2017-01-11 12:42 UTC (permalink / raw) To: openrisc On Mon, Jan 09, 2017 at 12:33:58PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > > Here is the v2 of this series. The first 5 patches are just cleanup: some > > exported headers were still under a non-uapi directory. > > Since this is meant as a cleanup, I commented on this to point out a cleaner > way to do the same. > > > The patch 6 was spotted by code review: there is no in-tree user of this > > functionality. > > The last patch remove the use of header-y. Now all files under an uapi > > directory are exported. > > Very nice! > > > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > > only, but there is two exceptions: > > - cris which exports arch/cris/include/uapi/arch-v[10|32]; > > This is interesting, though not your problem. Maybe someone who understands > cris better can comment on this: How is the decision made about which of > the arch/user.h headers gets used? I couldn't find that in the sources, > but it appears to be based on kernel compile-time settings, which is > wrong for user space header files that should be independent of the kernel > config. I believe it's since the CRISv10 and CRISv32 are very different beasts, and that is selected via kernel config... This part of the CRIS port has been transformed a couple of times from the original layout without uapi, and there's still some legacy silliness, where some files might have been exported but never used from userspace except for some corner cases. > > - tile which exports arch/tile/include/uapi/arch. > > Because I don't know if the output of 'make headers_install_all' can be changed, > > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > > output of 'make headers_install_all' to export asm headers in > > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > > everything under arch/<arch>/include/uapi/. > > I don't know if anyone still uses "make headers_install_all", I suspect > distros these days all use "make headers_install", so it probably > doesn't matter much. > > In case of cris, it should be easy enough to move all the contents of the > uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they > only seem to be referenced from there. This would seem to be a reasonable change. > For tile, I suspect that would not work as the arch/*.h headers are > apparently defined as interfaces for both user space and kernel. > > > Note also that exported files for asm are a mix of files listed by: > > - include/uapi/asm-generic/Kbuild.asm; > > - arch/x86/include/uapi/asm/Kbuild; > > - arch/x86/include/asm/Kbuild. > > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > > used by scripts/Makefile.asm-generic). > > > > This series has been tested with a 'make headers_install' on x86 and a > > 'make headers_install_all'. I've checked the result of both commands. > > > > This patch is built against linus tree. I don't know if it should be > > made against antoher tree. > > The series should probably get merged through the kbuild tree, but testing > it on mainline is fine here. > > Arnd /^JN - Jesper Nilsson -- Jesper Nilsson -- jesper.nilsson at axis.com ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-11 12:42 ` Jesper Nilsson 0 siblings, 0 replies; 554+ messages in thread From: Jesper Nilsson @ 2017-01-11 12:42 UTC (permalink / raw) To: linux-arm-kernel On Mon, Jan 09, 2017 at 12:33:58PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > > Here is the v2 of this series. The first 5 patches are just cleanup: some > > exported headers were still under a non-uapi directory. > > Since this is meant as a cleanup, I commented on this to point out a cleaner > way to do the same. > > > The patch 6 was spotted by code review: there is no in-tree user of this > > functionality. > > The last patch remove the use of header-y. Now all files under an uapi > > directory are exported. > > Very nice! > > > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > > only, but there is two exceptions: > > - cris which exports arch/cris/include/uapi/arch-v[10|32]; > > This is interesting, though not your problem. Maybe someone who understands > cris better can comment on this: How is the decision made about which of > the arch/user.h headers gets used? I couldn't find that in the sources, > but it appears to be based on kernel compile-time settings, which is > wrong for user space header files that should be independent of the kernel > config. I believe it's since the CRISv10 and CRISv32 are very different beasts, and that is selected via kernel config... This part of the CRIS port has been transformed a couple of times from the original layout without uapi, and there's still some legacy silliness, where some files might have been exported but never used from userspace except for some corner cases. > > - tile which exports arch/tile/include/uapi/arch. > > Because I don't know if the output of 'make headers_install_all' can be changed, > > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > > output of 'make headers_install_all' to export asm headers in > > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > > everything under arch/<arch>/include/uapi/. > > I don't know if anyone still uses "make headers_install_all", I suspect > distros these days all use "make headers_install", so it probably > doesn't matter much. > > In case of cris, it should be easy enough to move all the contents of the > uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they > only seem to be referenced from there. This would seem to be a reasonable change. > For tile, I suspect that would not work as the arch/*.h headers are > apparently defined as interfaces for both user space and kernel. > > > Note also that exported files for asm are a mix of files listed by: > > - include/uapi/asm-generic/Kbuild.asm; > > - arch/x86/include/uapi/asm/Kbuild; > > - arch/x86/include/asm/Kbuild. > > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > > used by scripts/Makefile.asm-generic). > > > > This series has been tested with a 'make headers_install' on x86 and a > > 'make headers_install_all'. I've checked the result of both commands. > > > > This patch is built against linus tree. I don't know if it should be > > made against antoher tree. > > The series should probably get merged through the kbuild tree, but testing > it on mainline is fine here. > > Arnd /^JN - Jesper Nilsson -- Jesper Nilsson -- jesper.nilsson at axis.com ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-11 12:42 ` Jesper Nilsson 0 siblings, 0 replies; 554+ messages in thread From: Jesper Nilsson @ 2017-01-11 12:42 UTC (permalink / raw) To: linux-snps-arc On Mon, Jan 09, 2017@12:33:58PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > > Here is the v2 of this series. The first 5 patches are just cleanup: some > > exported headers were still under a non-uapi directory. > > Since this is meant as a cleanup, I commented on this to point out a cleaner > way to do the same. > > > The patch 6 was spotted by code review: there is no in-tree user of this > > functionality. > > The last patch remove the use of header-y. Now all files under an uapi > > directory are exported. > > Very nice! > > > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > > only, but there is two exceptions: > > - cris which exports arch/cris/include/uapi/arch-v[10|32]; > > This is interesting, though not your problem. Maybe someone who understands > cris better can comment on this: How is the decision made about which of > the arch/user.h headers gets used? I couldn't find that in the sources, > but it appears to be based on kernel compile-time settings, which is > wrong for user space header files that should be independent of the kernel > config. I believe it's since the CRISv10 and CRISv32 are very different beasts, and that is selected via kernel config... This part of the CRIS port has been transformed a couple of times from the original layout without uapi, and there's still some legacy silliness, where some files might have been exported but never used from userspace except for some corner cases. > > - tile which exports arch/tile/include/uapi/arch. > > Because I don't know if the output of 'make headers_install_all' can be changed, > > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > > output of 'make headers_install_all' to export asm headers in > > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > > everything under arch/<arch>/include/uapi/. > > I don't know if anyone still uses "make headers_install_all", I suspect > distros these days all use "make headers_install", so it probably > doesn't matter much. > > In case of cris, it should be easy enough to move all the contents of the > uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they > only seem to be referenced from there. This would seem to be a reasonable change. > For tile, I suspect that would not work as the arch/*.h headers are > apparently defined as interfaces for both user space and kernel. > > > Note also that exported files for asm are a mix of files listed by: > > - include/uapi/asm-generic/Kbuild.asm; > > - arch/x86/include/uapi/asm/Kbuild; > > - arch/x86/include/asm/Kbuild. > > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > > used by scripts/Makefile.asm-generic). > > > > This series has been tested with a 'make headers_install' on x86 and a > > 'make headers_install_all'. I've checked the result of both commands. > > > > This patch is built against linus tree. I don't know if it should be > > made against antoher tree. > > The series should probably get merged through the kbuild tree, but testing > it on mainline is fine here. > > Arnd /^JN - Jesper Nilsson -- Jesper Nilsson -- jesper.nilsson at axis.com ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-11 12:42 ` Jesper Nilsson 0 siblings, 0 replies; 554+ messages in thread From: Jesper Nilsson @ 2017-01-11 12:42 UTC (permalink / raw) To: Arnd Bergmann Cc: linuxppc-dev, linux-kbuild, Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm-kernel, linux-nfs, linux-parisc, linux-cris-kernel, netdev, linux-mmc, linux-kernel, linux-spi, mmarek, netfilter-devel, linux-alpha, nios2-dev, davem On Mon, Jan 09, 2017 at 12:33:58PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > > Here is the v2 of this series. The first 5 patches are just cleanup: some > > exported headers were still under a non-uapi directory. > > Since this is meant as a cleanup, I commented on this to point out a cleaner > way to do the same. > > > The patch 6 was spotted by code review: there is no in-tree user of this > > functionality. > > The last patch remove the use of header-y. Now all files under an uapi > > directory are exported. > > Very nice! > > > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > > only, but there is two exceptions: > > - cris which exports arch/cris/include/uapi/arch-v[10|32]; > > This is interesting, though not your problem. Maybe someone who understands > cris better can comment on this: How is the decision made about which of > the arch/user.h headers gets used? I couldn't find that in the sources, > but it appears to be based on kernel compile-time settings, which is > wrong for user space header files that should be independent of the kernel > config. I believe it's since the CRISv10 and CRISv32 are very different beasts, and that is selected via kernel config... This part of the CRIS port has been transformed a couple of times from the original layout without uapi, and there's still some legacy silliness, where some files might have been exported but never used from userspace except for some corner cases. > > - tile which exports arch/tile/include/uapi/arch. > > Because I don't know if the output of 'make headers_install_all' can be changed, > > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > > output of 'make headers_install_all' to export asm headers in > > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > > everything under arch/<arch>/include/uapi/. > > I don't know if anyone still uses "make headers_install_all", I suspect > distros these days all use "make headers_install", so it probably > doesn't matter much. > > In case of cris, it should be easy enough to move all the contents of the > uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they > only seem to be referenced from there. This would seem to be a reasonable change. > For tile, I suspect that would not work as the arch/*.h headers are > apparently defined as interfaces for both user space and kernel. > > > Note also that exported files for asm are a mix of files listed by: > > - include/uapi/asm-generic/Kbuild.asm; > > - arch/x86/include/uapi/asm/Kbuild; > > - arch/x86/include/asm/Kbuild. > > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > > used by scripts/Makefile.asm-generic). > > > > This series has been tested with a 'make headers_install' on x86 and a > > 'make headers_install_all'. I've checked the result of both commands. > > > > This patch is built against linus tree. I don't know if it should be > > made against antoher tree. > > The series should probably get merged through the kbuild tree, but testing > it on mainline is fine here. > > Arnd /^JN - Jesper Nilsson -- Jesper Nilsson -- jesper.nilsson@axis.com ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-11 12:42 ` Jesper Nilsson 0 siblings, 0 replies; 554+ messages in thread From: Jesper Nilsson @ 2017-01-11 12:42 UTC (permalink / raw) To: Arnd Bergmann Cc: linuxppc-dev, linux-kbuild, Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm-kernel, linux-nfs, linux-parisc, linux-cris-kernel, netdev, linux-mmc, linux-kernel, linux-spi, mmarek, netfilter-devel, linux-alpha, nios2-dev, davem On Mon, Jan 09, 2017 at 12:33:58PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > > Here is the v2 of this series. The first 5 patches are just cleanup: some > > exported headers were still under a non-uapi directory. > > Since this is meant as a cleanup, I commented on this to point out a cleaner > way to do the same. > > > The patch 6 was spotted by code review: there is no in-tree user of this > > functionality. > > The last patch remove the use of header-y. Now all files under an uapi > > directory are exported. > > Very nice! > > > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > > only, but there is two exceptions: > > - cris which exports arch/cris/include/uapi/arch-v[10|32]; > > This is interesting, though not your problem. Maybe someone who understands > cris better can comment on this: How is the decision made about which of > the arch/user.h headers gets used? I couldn't find that in the sources, > but it appears to be based on kernel compile-time settings, which is > wrong for user space header files that should be independent of the kernel > config. I believe it's since the CRISv10 and CRISv32 are very different beasts, and that is selected via kernel config... This part of the CRIS port has been transformed a couple of times from the original layout without uapi, and there's still some legacy silliness, where some files might have been exported but never used from userspace except for some corner cases. > > - tile which exports arch/tile/include/uapi/arch. > > Because I don't know if the output of 'make headers_install_all' can be changed, > > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > > output of 'make headers_install_all' to export asm headers in > > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > > everything under arch/<arch>/include/uapi/. > > I don't know if anyone still uses "make headers_install_all", I suspect > distros these days all use "make headers_install", so it probably > doesn't matter much. > > In case of cris, it should be easy enough to move all the contents of the > uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they > only seem to be referenced from there. This would seem to be a reasonable change. > For tile, I suspect that would not work as the arch/*.h headers are > apparently defined as interfaces for both user space and kernel. > > > Note also that exported files for asm are a mix of files listed by: > > - include/uapi/asm-generic/Kbuild.asm; > > - arch/x86/include/uapi/asm/Kbuild; > > - arch/x86/include/asm/Kbuild. > > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > > used by scripts/Makefile.asm-generic). > > > > This series has been tested with a 'make headers_install' on x86 and a > > 'make headers_install_all'. I've checked the result of both commands. > > > > This patch is built against linus tree. I don't know if it should be > > made against antoher tree. > > The series should probably get merged through the kbuild tree, but testing > it on mainline is fine here. > > Arnd /^JN - Jesper Nilsson -- Jesper Nilsson -- jesper.nilsson@axis.com ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-11 12:42 ` Jesper Nilsson 0 siblings, 0 replies; 554+ messages in thread From: Jesper Nilsson @ 2017-01-11 12:42 UTC (permalink / raw) To: Arnd Bergmann Cc: linuxppc-dev, linux-kbuild, Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel, l On Mon, Jan 09, 2017 at 12:33:58PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > > Here is the v2 of this series. The first 5 patches are just cleanup: some > > exported headers were still under a non-uapi directory. > > Since this is meant as a cleanup, I commented on this to point out a cleaner > way to do the same. > > > The patch 6 was spotted by code review: there is no in-tree user of this > > functionality. > > The last patch remove the use of header-y. Now all files under an uapi > > directory are exported. > > Very nice! > > > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > > only, but there is two exceptions: > > - cris which exports arch/cris/include/uapi/arch-v[10|32]; > > This is interesting, though not your problem. Maybe someone who understands > cris better can comment on this: How is the decision made about which of > the arch/user.h headers gets used? I couldn't find that in the sources, > but it appears to be based on kernel compile-time settings, which is > wrong for user space header files that should be independent of the kernel > config. I believe it's since the CRISv10 and CRISv32 are very different beasts, and that is selected via kernel config... This part of the CRIS port has been transformed a couple of times from the original layout without uapi, and there's still some legacy silliness, where some files might have been exported but never used from userspace except for some corner cases. > > - tile which exports arch/tile/include/uapi/arch. > > Because I don't know if the output of 'make headers_install_all' can be changed, > > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > > output of 'make headers_install_all' to export asm headers in > > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > > everything under arch/<arch>/include/uapi/. > > I don't know if anyone still uses "make headers_install_all", I suspect > distros these days all use "make headers_install", so it probably > doesn't matter much. > > In case of cris, it should be easy enough to move all the contents of the > uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they > only seem to be referenced from there. This would seem to be a reasonable change. > For tile, I suspect that would not work as the arch/*.h headers are > apparently defined as interfaces for both user space and kernel. > > > Note also that exported files for asm are a mix of files listed by: > > - include/uapi/asm-generic/Kbuild.asm; > > - arch/x86/include/uapi/asm/Kbuild; > > - arch/x86/include/asm/Kbuild. > > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > > used by scripts/Makefile.asm-generic). > > > > This series has been tested with a 'make headers_install' on x86 and a > > 'make headers_install_all'. I've checked the result of both commands. > > > > This patch is built against linus tree. I don't know if it should be > > made against antoher tree. > > The series should probably get merged through the kbuild tree, but testing > it on mainline is fine here. > > Arnd /^JN - Jesper Nilsson -- Jesper Nilsson -- jesper.nilsson@axis.com ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 0/7] uapi: export all headers under uapi directories @ 2017-01-11 12:42 ` Jesper Nilsson 0 siblings, 0 replies; 554+ messages in thread From: Jesper Nilsson @ 2017-01-11 12:42 UTC (permalink / raw) To: Arnd Bergmann Cc: linuxppc-dev, linux-kbuild, Nicolas Dichtel, linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, adi-buildroot-devel On Mon, Jan 09, 2017 at 12:33:58PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > > Here is the v2 of this series. The first 5 patches are just cleanup: some > > exported headers were still under a non-uapi directory. > > Since this is meant as a cleanup, I commented on this to point out a cleaner > way to do the same. > > > The patch 6 was spotted by code review: there is no in-tree user of this > > functionality. > > The last patch remove the use of header-y. Now all files under an uapi > > directory are exported. > > Very nice! > > > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > > only, but there is two exceptions: > > - cris which exports arch/cris/include/uapi/arch-v[10|32]; > > This is interesting, though not your problem. Maybe someone who understands > cris better can comment on this: How is the decision made about which of > the arch/user.h headers gets used? I couldn't find that in the sources, > but it appears to be based on kernel compile-time settings, which is > wrong for user space header files that should be independent of the kernel > config. I believe it's since the CRISv10 and CRISv32 are very different beasts, and that is selected via kernel config... This part of the CRIS port has been transformed a couple of times from the original layout without uapi, and there's still some legacy silliness, where some files might have been exported but never used from userspace except for some corner cases. > > - tile which exports arch/tile/include/uapi/arch. > > Because I don't know if the output of 'make headers_install_all' can be changed, > > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > > output of 'make headers_install_all' to export asm headers in > > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > > everything under arch/<arch>/include/uapi/. > > I don't know if anyone still uses "make headers_install_all", I suspect > distros these days all use "make headers_install", so it probably > doesn't matter much. > > In case of cris, it should be easy enough to move all the contents of the > uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they > only seem to be referenced from there. This would seem to be a reasonable change. > For tile, I suspect that would not work as the arch/*.h headers are > apparently defined as interfaces for both user space and kernel. > > > Note also that exported files for asm are a mix of files listed by: > > - include/uapi/asm-generic/Kbuild.asm; > > - arch/x86/include/uapi/asm/Kbuild; > > - arch/x86/include/asm/Kbuild. > > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > > used by scripts/Makefile.asm-generic). > > > > This series has been tested with a 'make headers_install' on x86 and a > > 'make headers_install_all'. I've checked the result of both commands. > > > > This patch is built against linus tree. I don't know if it should be > > made against antoher tree. > > The series should probably get merged through the kbuild tree, but testing > it on mainline is fine here. > > Arnd /^JN - Jesper Nilsson -- Jesper Nilsson -- jesper.nilsson@axis.com ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v2 0/7] uapi: export all headers under uapi directories 2017-01-09 11:33 ` Arnd Bergmann ` (8 preceding siblings ...) (?) @ 2017-01-11 12:42 ` Jesper Nilsson -1 siblings, 0 replies; 554+ messages in thread From: Jesper Nilsson @ 2017-01-11 12:42 UTC (permalink / raw) To: Arnd Bergmann Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, Nicolas Dichtel, linux-metag, linux-arm- On Mon, Jan 09, 2017 at 12:33:58PM +0100, Arnd Bergmann wrote: > On Friday, January 6, 2017 10:43:52 AM CET Nicolas Dichtel wrote: > > Here is the v2 of this series. The first 5 patches are just cleanup: some > > exported headers were still under a non-uapi directory. > > Since this is meant as a cleanup, I commented on this to point out a cleaner > way to do the same. > > > The patch 6 was spotted by code review: there is no in-tree user of this > > functionality. > > The last patch remove the use of header-y. Now all files under an uapi > > directory are exported. > > Very nice! > > > asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm > > only, but there is two exceptions: > > - cris which exports arch/cris/include/uapi/arch-v[10|32]; > > This is interesting, though not your problem. Maybe someone who understands > cris better can comment on this: How is the decision made about which of > the arch/user.h headers gets used? I couldn't find that in the sources, > but it appears to be based on kernel compile-time settings, which is > wrong for user space header files that should be independent of the kernel > config. I believe it's since the CRISv10 and CRISv32 are very different beasts, and that is selected via kernel config... This part of the CRIS port has been transformed a couple of times from the original layout without uapi, and there's still some legacy silliness, where some files might have been exported but never used from userspace except for some corner cases. > > - tile which exports arch/tile/include/uapi/arch. > > Because I don't know if the output of 'make headers_install_all' can be changed, > > I introduce subdir-y in Kbuild file. The headers_install_all target copies all > > asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but > > arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not > > prefixed (they are put asis in usr/include/). If it's acceptable to modify the > > output of 'make headers_install_all' to export asm headers in > > usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports > > everything under arch/<arch>/include/uapi/. > > I don't know if anyone still uses "make headers_install_all", I suspect > distros these days all use "make headers_install", so it probably > doesn't matter much. > > In case of cris, it should be easy enough to move all the contents of the > uapi/arch-*/*.h headers into the respective uapi/asm/*.h headers, they > only seem to be referenced from there. This would seem to be a reasonable change. > For tile, I suspect that would not work as the arch/*.h headers are > apparently defined as interfaces for both user space and kernel. > > > Note also that exported files for asm are a mix of files listed by: > > - include/uapi/asm-generic/Kbuild.asm; > > - arch/x86/include/uapi/asm/Kbuild; > > - arch/x86/include/asm/Kbuild. > > This complicates a lot the processing (arch/x86/include/asm/Kbuild is also > > used by scripts/Makefile.asm-generic). > > > > This series has been tested with a 'make headers_install' on x86 and a > > 'make headers_install_all'. I've checked the result of both commands. > > > > This patch is built against linus tree. I don't know if it should be > > made against antoher tree. > > The series should probably get merged through the kbuild tree, but testing > it on mainline is fine here. > > Arnd /^JN - Jesper Nilsson -- Jesper Nilsson -- jesper.nilsson@axis.com _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 0/8] uapi: export all headers under uapi directories 2017-01-09 11:33 ` Arnd Bergmann ` (3 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k Here is the v3 of this series. The first 5 patches are just cleanup: some exported headers were still under a non-uapi directory or (x86 case) were wrongly exported. The patch 6 was spotted by code review: there is no in-tree user of this functionality. Patches 7 and 8 remove the need to list explicitly headers. Now all files under an uapi directory are exported. This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. If I must rebase it against the kbuild tree, just tell me ;-) v2 -> v3: - patch #1: remove arch/arm/include/asm/types.h - patch #2: remove arch/h8300/include/asm/bitsperlong.h - patch #3: remove arch/nios2/include/uapi/asm/setup.h - patch #4: don't export msr-index.h - patch #5: fix a typo: s/unput-files3-name/input-files3-name - patch #6: no change - patch #7: fix include/uapi/asm-generic/Kbuild.asm by introducing mandatory-y - add patch #8 v1 -> v2: - add patch #1 to #6 - patch #7: remove use of header-y Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v3 0/8] uapi: export all headers under uapi directories @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: openrisc Here is the v3 of this series. The first 5 patches are just cleanup: some exported headers were still under a non-uapi directory or (x86 case) were wrongly exported. The patch 6 was spotted by code review: there is no in-tree user of this functionality. Patches 7 and 8 remove the need to list explicitly headers. Now all files under an uapi directory are exported. This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. If I must rebase it against the kbuild tree, just tell me ;-) v2 -> v3: - patch #1: remove arch/arm/include/asm/types.h - patch #2: remove arch/h8300/include/asm/bitsperlong.h - patch #3: remove arch/nios2/include/uapi/asm/setup.h - patch #4: don't export msr-index.h - patch #5: fix a typo: s/unput-files3-name/input-files3-name - patch #6: no change - patch #7: fix include/uapi/asm-generic/Kbuild.asm by introducing mandatory-y - add patch #8 v1 -> v2: - add patch #1 to #6 - patch #7: remove use of header-y Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 0/8] uapi: export all headers under uapi directories @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: linux-snps-arc Here is the v3 of this series. The first 5 patches are just cleanup: some exported headers were still under a non-uapi directory or (x86 case) were wrongly exported. The patch 6 was spotted by code review: there is no in-tree user of this functionality. Patches 7 and 8 remove the need to list explicitly headers. Now all files under an uapi directory are exported. This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. If I must rebase it against the kbuild tree, just tell me ;-) v2 -> v3: - patch #1: remove arch/arm/include/asm/types.h - patch #2: remove arch/h8300/include/asm/bitsperlong.h - patch #3: remove arch/nios2/include/uapi/asm/setup.h - patch #4: don't export msr-index.h - patch #5: fix a typo: s/unput-files3-name/input-files3-name - patch #6: no change - patch #7: fix include/uapi/asm-generic/Kbuild.asm by introducing mandatory-y - add patch #8 v1 -> v2: - add patch #1 to #6 - patch #7: remove use of header-y Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 0/8] uapi: export all headers under uapi directories @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch Here is the v3 of this series. The first 5 patches are just cleanup: some exported headers were still under a non-uapi directory or (x86 case) were wrongly exported. The patch 6 was spotted by code review: there is no in-tree user of this functionality. Patches 7 and 8 remove the need to list explicitly headers. Now all files under an uapi directory are exported. This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. If I must rebase it against the kbuild tree, just tell me ;-) v2 -> v3: - patch #1: remove arch/arm/include/asm/types.h - patch #2: remove arch/h8300/include/asm/bitsperlong.h - patch #3: remove arch/nios2/include/uapi/asm/setup.h - patch #4: don't export msr-index.h - patch #5: fix a typo: s/unput-files3-name/input-files3-name - patch #6: no change - patch #7: fix include/uapi/asm-generic/Kbuild.asm by introducing mandatory-y - add patch #8 v1 -> v2: - add patch #1 to #6 - patch #7: remove use of header-y Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 0/8] uapi: export all headers under uapi directories @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch Here is the v3 of this series. The first 5 patches are just cleanup: some exported headers were still under a non-uapi directory or (x86 case) were wrongly exported. The patch 6 was spotted by code review: there is no in-tree user of this functionality. Patches 7 and 8 remove the need to list explicitly headers. Now all files under an uapi directory are exported. This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. If I must rebase it against the kbuild tree, just tell me ;-) v2 -> v3: - patch #1: remove arch/arm/include/asm/types.h - patch #2: remove arch/h8300/include/asm/bitsperlong.h - patch #3: remove arch/nios2/include/uapi/asm/setup.h - patch #4: don't export msr-index.h - patch #5: fix a typo: s/unput-files3-name/input-files3-name - patch #6: no change - patch #7: fix include/uapi/asm-generic/Kbuild.asm by introducing mandatory-y - add patch #8 v1 -> v2: - add patch #1 to #6 - patch #7: remove use of header-y Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 0/8] uapi: export all headers under uapi directories @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k Here is the v3 of this series. The first 5 patches are just cleanup: some exported headers were still under a non-uapi directory or (x86 case) were wrongly exported. The patch 6 was spotted by code review: there is no in-tree user of this functionality. Patches 7 and 8 remove the need to list explicitly headers. Now all files under an uapi directory are exported. This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. If I must rebase it against the kbuild tree, just tell me ;-) v2 -> v3: - patch #1: remove arch/arm/include/asm/types.h - patch #2: remove arch/h8300/include/asm/bitsperlong.h - patch #3: remove arch/nios2/include/uapi/asm/setup.h - patch #4: don't export msr-index.h - patch #5: fix a typo: s/unput-files3-name/input-files3-name - patch #6: no change - patch #7: fix include/uapi/asm-generic/Kbuild.asm by introducing mandatory-y - add patch #8 v1 -> v2: - add patch #1 to #6 - patch #7: remove use of header-y Comments are welcomed, Nicolas ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/ ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 1/8] arm: put types.h in uapi 2017-01-13 10:46 ` Nicolas Dichtel ` (3 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/arm/include/asm/types.h | 40 --------------------------------------- arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 arch/arm/include/asm/types.h create mode 100644 arch/arm/include/uapi/asm/types.h diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h deleted file mode 100644 index a53cdb8f068c..000000000000 --- a/arch/arm/include/asm/types.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef _ASM_TYPES_H -#define _ASM_TYPES_H - -#include <asm-generic/int-ll64.h> - -/* - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as - * unambiguous on ARM as you would expect. For the types below, there is a - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc - * and the kernel itself, which results in build errors if you try to build with - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' - * in order to use NEON intrinsics) - * - * As the typedefs for these types in 'stdint.h' are based on builtin defines - * supplied by GCC, we can tweak these to align with the kernel's idea of those - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same - * source file (provided that -ffreestanding is used). - * - * int32_t uint32_t uintptr_t - * bare metal GCC long unsigned long unsigned int - * glibc GCC int unsigned int unsigned int - * kernel int unsigned int unsigned long - */ - -#ifdef __INT32_TYPE__ -#undef __INT32_TYPE__ -#define __INT32_TYPE__ int -#endif - -#ifdef __UINT32_TYPE__ -#undef __UINT32_TYPE__ -#define __UINT32_TYPE__ unsigned int -#endif - -#ifdef __UINTPTR_TYPE__ -#undef __UINTPTR_TYPE__ -#define __UINTPTR_TYPE__ unsigned long -#endif - -#endif /* _ASM_TYPES_H */ diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h new file mode 100644 index 000000000000..9435a42f575e --- /dev/null +++ b/arch/arm/include/uapi/asm/types.h @@ -0,0 +1,40 @@ +#ifndef _UAPI_ASM_TYPES_H +#define _UAPI_ASM_TYPES_H + +#include <asm-generic/int-ll64.h> + +/* + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as + * unambiguous on ARM as you would expect. For the types below, there is a + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc + * and the kernel itself, which results in build errors if you try to build with + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' + * in order to use NEON intrinsics) + * + * As the typedefs for these types in 'stdint.h' are based on builtin defines + * supplied by GCC, we can tweak these to align with the kernel's idea of those + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same + * source file (provided that -ffreestanding is used). + * + * int32_t uint32_t uintptr_t + * bare metal GCC long unsigned long unsigned int + * glibc GCC int unsigned int unsigned int + * kernel int unsigned int unsigned long + */ + +#ifdef __INT32_TYPE__ +#undef __INT32_TYPE__ +#define __INT32_TYPE__ int +#endif + +#ifdef __UINT32_TYPE__ +#undef __UINT32_TYPE__ +#define __UINT32_TYPE__ unsigned int +#endif + +#ifdef __UINTPTR_TYPE__ +#undef __UINTPTR_TYPE__ +#define __UINTPTR_TYPE__ unsigned long +#endif + +#endif /* _UAPI_ASM_TYPES_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: openrisc This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/arm/include/asm/types.h | 40 --------------------------------------- arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 arch/arm/include/asm/types.h create mode 100644 arch/arm/include/uapi/asm/types.h diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h deleted file mode 100644 index a53cdb8f068c..000000000000 --- a/arch/arm/include/asm/types.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef _ASM_TYPES_H -#define _ASM_TYPES_H - -#include <asm-generic/int-ll64.h> - -/* - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as - * unambiguous on ARM as you would expect. For the types below, there is a - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc - * and the kernel itself, which results in build errors if you try to build with - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' - * in order to use NEON intrinsics) - * - * As the typedefs for these types in 'stdint.h' are based on builtin defines - * supplied by GCC, we can tweak these to align with the kernel's idea of those - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same - * source file (provided that -ffreestanding is used). - * - * int32_t uint32_t uintptr_t - * bare metal GCC long unsigned long unsigned int - * glibc GCC int unsigned int unsigned int - * kernel int unsigned int unsigned long - */ - -#ifdef __INT32_TYPE__ -#undef __INT32_TYPE__ -#define __INT32_TYPE__ int -#endif - -#ifdef __UINT32_TYPE__ -#undef __UINT32_TYPE__ -#define __UINT32_TYPE__ unsigned int -#endif - -#ifdef __UINTPTR_TYPE__ -#undef __UINTPTR_TYPE__ -#define __UINTPTR_TYPE__ unsigned long -#endif - -#endif /* _ASM_TYPES_H */ diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h new file mode 100644 index 000000000000..9435a42f575e --- /dev/null +++ b/arch/arm/include/uapi/asm/types.h @@ -0,0 +1,40 @@ +#ifndef _UAPI_ASM_TYPES_H +#define _UAPI_ASM_TYPES_H + +#include <asm-generic/int-ll64.h> + +/* + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as + * unambiguous on ARM as you would expect. For the types below, there is a + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc + * and the kernel itself, which results in build errors if you try to build with + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' + * in order to use NEON intrinsics) + * + * As the typedefs for these types in 'stdint.h' are based on builtin defines + * supplied by GCC, we can tweak these to align with the kernel's idea of those + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same + * source file (provided that -ffreestanding is used). + * + * int32_t uint32_t uintptr_t + * bare metal GCC long unsigned long unsigned int + * glibc GCC int unsigned int unsigned int + * kernel int unsigned int unsigned long + */ + +#ifdef __INT32_TYPE__ +#undef __INT32_TYPE__ +#define __INT32_TYPE__ int +#endif + +#ifdef __UINT32_TYPE__ +#undef __UINT32_TYPE__ +#define __UINT32_TYPE__ unsigned int +#endif + +#ifdef __UINTPTR_TYPE__ +#undef __UINTPTR_TYPE__ +#define __UINTPTR_TYPE__ unsigned long +#endif + +#endif /* _UAPI_ASM_TYPES_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: linux-snps-arc This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> --- arch/arm/include/asm/types.h | 40 --------------------------------------- arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 arch/arm/include/asm/types.h create mode 100644 arch/arm/include/uapi/asm/types.h diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h deleted file mode 100644 index a53cdb8f068c..000000000000 --- a/arch/arm/include/asm/types.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef _ASM_TYPES_H -#define _ASM_TYPES_H - -#include <asm-generic/int-ll64.h> - -/* - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as - * unambiguous on ARM as you would expect. For the types below, there is a - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc - * and the kernel itself, which results in build errors if you try to build with - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' - * in order to use NEON intrinsics) - * - * As the typedefs for these types in 'stdint.h' are based on builtin defines - * supplied by GCC, we can tweak these to align with the kernel's idea of those - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same - * source file (provided that -ffreestanding is used). - * - * int32_t uint32_t uintptr_t - * bare metal GCC long unsigned long unsigned int - * glibc GCC int unsigned int unsigned int - * kernel int unsigned int unsigned long - */ - -#ifdef __INT32_TYPE__ -#undef __INT32_TYPE__ -#define __INT32_TYPE__ int -#endif - -#ifdef __UINT32_TYPE__ -#undef __UINT32_TYPE__ -#define __UINT32_TYPE__ unsigned int -#endif - -#ifdef __UINTPTR_TYPE__ -#undef __UINTPTR_TYPE__ -#define __UINTPTR_TYPE__ unsigned long -#endif - -#endif /* _ASM_TYPES_H */ diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h new file mode 100644 index 000000000000..9435a42f575e --- /dev/null +++ b/arch/arm/include/uapi/asm/types.h @@ -0,0 +1,40 @@ +#ifndef _UAPI_ASM_TYPES_H +#define _UAPI_ASM_TYPES_H + +#include <asm-generic/int-ll64.h> + +/* + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as + * unambiguous on ARM as you would expect. For the types below, there is a + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc + * and the kernel itself, which results in build errors if you try to build with + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' + * in order to use NEON intrinsics) + * + * As the typedefs for these types in 'stdint.h' are based on builtin defines + * supplied by GCC, we can tweak these to align with the kernel's idea of those + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same + * source file (provided that -ffreestanding is used). + * + * int32_t uint32_t uintptr_t + * bare metal GCC long unsigned long unsigned int + * glibc GCC int unsigned int unsigned int + * kernel int unsigned int unsigned long + */ + +#ifdef __INT32_TYPE__ +#undef __INT32_TYPE__ +#define __INT32_TYPE__ int +#endif + +#ifdef __UINT32_TYPE__ +#undef __UINT32_TYPE__ +#define __UINT32_TYPE__ unsigned int +#endif + +#ifdef __UINTPTR_TYPE__ +#undef __UINTPTR_TYPE__ +#define __UINTPTR_TYPE__ unsigned long +#endif + +#endif /* _UAPI_ASM_TYPES_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/arm/include/asm/types.h | 40 --------------------------------------- arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 arch/arm/include/asm/types.h create mode 100644 arch/arm/include/uapi/asm/types.h diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h deleted file mode 100644 index a53cdb8f068c..000000000000 --- a/arch/arm/include/asm/types.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef _ASM_TYPES_H -#define _ASM_TYPES_H - -#include <asm-generic/int-ll64.h> - -/* - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as - * unambiguous on ARM as you would expect. For the types below, there is a - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc - * and the kernel itself, which results in build errors if you try to build with - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' - * in order to use NEON intrinsics) - * - * As the typedefs for these types in 'stdint.h' are based on builtin defines - * supplied by GCC, we can tweak these to align with the kernel's idea of those - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same - * source file (provided that -ffreestanding is used). - * - * int32_t uint32_t uintptr_t - * bare metal GCC long unsigned long unsigned int - * glibc GCC int unsigned int unsigned int - * kernel int unsigned int unsigned long - */ - -#ifdef __INT32_TYPE__ -#undef __INT32_TYPE__ -#define __INT32_TYPE__ int -#endif - -#ifdef __UINT32_TYPE__ -#undef __UINT32_TYPE__ -#define __UINT32_TYPE__ unsigned int -#endif - -#ifdef __UINTPTR_TYPE__ -#undef __UINTPTR_TYPE__ -#define __UINTPTR_TYPE__ unsigned long -#endif - -#endif /* _ASM_TYPES_H */ diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h new file mode 100644 index 000000000000..9435a42f575e --- /dev/null +++ b/arch/arm/include/uapi/asm/types.h @@ -0,0 +1,40 @@ +#ifndef _UAPI_ASM_TYPES_H +#define _UAPI_ASM_TYPES_H + +#include <asm-generic/int-ll64.h> + +/* + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as + * unambiguous on ARM as you would expect. For the types below, there is a + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc + * and the kernel itself, which results in build errors if you try to build with + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' + * in order to use NEON intrinsics) + * + * As the typedefs for these types in 'stdint.h' are based on builtin defines + * supplied by GCC, we can tweak these to align with the kernel's idea of those + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same + * source file (provided that -ffreestanding is used). + * + * int32_t uint32_t uintptr_t + * bare metal GCC long unsigned long unsigned int + * glibc GCC int unsigned int unsigned int + * kernel int unsigned int unsigned long + */ + +#ifdef __INT32_TYPE__ +#undef __INT32_TYPE__ +#define __INT32_TYPE__ int +#endif + +#ifdef __UINT32_TYPE__ +#undef __UINT32_TYPE__ +#define __UINT32_TYPE__ unsigned int +#endif + +#ifdef __UINTPTR_TYPE__ +#undef __UINTPTR_TYPE__ +#define __UINTPTR_TYPE__ unsigned long +#endif + +#endif /* _UAPI_ASM_TYPES_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/arm/include/asm/types.h | 40 --------------------------------------- arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 arch/arm/include/asm/types.h create mode 100644 arch/arm/include/uapi/asm/types.h diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h deleted file mode 100644 index a53cdb8f068c..000000000000 --- a/arch/arm/include/asm/types.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef _ASM_TYPES_H -#define _ASM_TYPES_H - -#include <asm-generic/int-ll64.h> - -/* - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as - * unambiguous on ARM as you would expect. For the types below, there is a - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc - * and the kernel itself, which results in build errors if you try to build with - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' - * in order to use NEON intrinsics) - * - * As the typedefs for these types in 'stdint.h' are based on builtin defines - * supplied by GCC, we can tweak these to align with the kernel's idea of those - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same - * source file (provided that -ffreestanding is used). - * - * int32_t uint32_t uintptr_t - * bare metal GCC long unsigned long unsigned int - * glibc GCC int unsigned int unsigned int - * kernel int unsigned int unsigned long - */ - -#ifdef __INT32_TYPE__ -#undef __INT32_TYPE__ -#define __INT32_TYPE__ int -#endif - -#ifdef __UINT32_TYPE__ -#undef __UINT32_TYPE__ -#define __UINT32_TYPE__ unsigned int -#endif - -#ifdef __UINTPTR_TYPE__ -#undef __UINTPTR_TYPE__ -#define __UINTPTR_TYPE__ unsigned long -#endif - -#endif /* _ASM_TYPES_H */ diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h new file mode 100644 index 000000000000..9435a42f575e --- /dev/null +++ b/arch/arm/include/uapi/asm/types.h @@ -0,0 +1,40 @@ +#ifndef _UAPI_ASM_TYPES_H +#define _UAPI_ASM_TYPES_H + +#include <asm-generic/int-ll64.h> + +/* + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as + * unambiguous on ARM as you would expect. For the types below, there is a + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc + * and the kernel itself, which results in build errors if you try to build with + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' + * in order to use NEON intrinsics) + * + * As the typedefs for these types in 'stdint.h' are based on builtin defines + * supplied by GCC, we can tweak these to align with the kernel's idea of those + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same + * source file (provided that -ffreestanding is used). + * + * int32_t uint32_t uintptr_t + * bare metal GCC long unsigned long unsigned int + * glibc GCC int unsigned int unsigned int + * kernel int unsigned int unsigned long + */ + +#ifdef __INT32_TYPE__ +#undef __INT32_TYPE__ +#define __INT32_TYPE__ int +#endif + +#ifdef __UINT32_TYPE__ +#undef __UINT32_TYPE__ +#define __UINT32_TYPE__ unsigned int +#endif + +#ifdef __UINTPTR_TYPE__ +#undef __UINTPTR_TYPE__ +#define __UINTPTR_TYPE__ unsigned long +#endif + +#endif /* _UAPI_ASM_TYPES_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/arm/include/asm/types.h | 40 --------------------------------------- arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 arch/arm/include/asm/types.h create mode 100644 arch/arm/include/uapi/asm/types.h diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h deleted file mode 100644 index a53cdb8f068c..000000000000 --- a/arch/arm/include/asm/types.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef _ASM_TYPES_H -#define _ASM_TYPES_H - -#include <asm-generic/int-ll64.h> - -/* - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as - * unambiguous on ARM as you would expect. For the types below, there is a - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc - * and the kernel itself, which results in build errors if you try to build with - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' - * in order to use NEON intrinsics) - * - * As the typedefs for these types in 'stdint.h' are based on builtin defines - * supplied by GCC, we can tweak these to align with the kernel's idea of those - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same - * source file (provided that -ffreestanding is used). - * - * int32_t uint32_t uintptr_t - * bare metal GCC long unsigned long unsigned int - * glibc GCC int unsigned int unsigned int - * kernel int unsigned int unsigned long - */ - -#ifdef __INT32_TYPE__ -#undef __INT32_TYPE__ -#define __INT32_TYPE__ int -#endif - -#ifdef __UINT32_TYPE__ -#undef __UINT32_TYPE__ -#define __UINT32_TYPE__ unsigned int -#endif - -#ifdef __UINTPTR_TYPE__ -#undef __UINTPTR_TYPE__ -#define __UINTPTR_TYPE__ unsigned long -#endif - -#endif /* _ASM_TYPES_H */ diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h new file mode 100644 index 000000000000..9435a42f575e --- /dev/null +++ b/arch/arm/include/uapi/asm/types.h @@ -0,0 +1,40 @@ +#ifndef _UAPI_ASM_TYPES_H +#define _UAPI_ASM_TYPES_H + +#include <asm-generic/int-ll64.h> + +/* + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as + * unambiguous on ARM as you would expect. For the types below, there is a + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc + * and the kernel itself, which results in build errors if you try to build with + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' + * in order to use NEON intrinsics) + * + * As the typedefs for these types in 'stdint.h' are based on builtin defines + * supplied by GCC, we can tweak these to align with the kernel's idea of those + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same + * source file (provided that -ffreestanding is used). + * + * int32_t uint32_t uintptr_t + * bare metal GCC long unsigned long unsigned int + * glibc GCC int unsigned int unsigned int + * kernel int unsigned int unsigned long + */ + +#ifdef __INT32_TYPE__ +#undef __INT32_TYPE__ +#define __INT32_TYPE__ int +#endif + +#ifdef __UINT32_TYPE__ +#undef __UINT32_TYPE__ +#define __UINT32_TYPE__ unsigned int +#endif + +#ifdef __UINTPTR_TYPE__ +#undef __UINTPTR_TYPE__ +#define __UINTPTR_TYPE__ unsigned long +#endif + +#endif /* _UAPI_ASM_TYPES_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v3 1/8] arm: put types.h in uapi 2017-01-13 10:46 ` Nicolas Dichtel ` (4 preceding siblings ...) (?) @ 2017-01-13 17:06 ` Russell King - ARM Linux -1 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-13 17:06 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openri On Fri, Jan 13, 2017 at 11:46:39AM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. I'm taking this patch, but with the following commit log: Due to the way kbuild works, this header was unintentionally exported back in 2013 when it was created, despite it not being in a uapi/ directory. This is very non-intuitive behaviour by Kbuild. However, we've had this include exported to userland for almost four years, and searching google for "ARM types.h __UINTPTR_TYPE__" gives no hint that anyone has complained about it. So, let's make it officially exported in this state. If anyone has any objections, they better shout sooner rather than later. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > arch/arm/include/asm/types.h | 40 --------------------------------------- > arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 40 insertions(+), 40 deletions(-) > delete mode 100644 arch/arm/include/asm/types.h > create mode 100644 arch/arm/include/uapi/asm/types.h > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > deleted file mode 100644 > index a53cdb8f068c..000000000000 > --- a/arch/arm/include/asm/types.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -#ifndef _ASM_TYPES_H > -#define _ASM_TYPES_H > - > -#include <asm-generic/int-ll64.h> > - > -/* > - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as > - * unambiguous on ARM as you would expect. For the types below, there is a > - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc > - * and the kernel itself, which results in build errors if you try to build with > - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' > - * in order to use NEON intrinsics) > - * > - * As the typedefs for these types in 'stdint.h' are based on builtin defines > - * supplied by GCC, we can tweak these to align with the kernel's idea of those > - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same > - * source file (provided that -ffreestanding is used). > - * > - * int32_t uint32_t uintptr_t > - * bare metal GCC long unsigned long unsigned int > - * glibc GCC int unsigned int unsigned int > - * kernel int unsigned int unsigned long > - */ > - > -#ifdef __INT32_TYPE__ > -#undef __INT32_TYPE__ > -#define __INT32_TYPE__ int > -#endif > - > -#ifdef __UINT32_TYPE__ > -#undef __UINT32_TYPE__ > -#define __UINT32_TYPE__ unsigned int > -#endif > - > -#ifdef __UINTPTR_TYPE__ > -#undef __UINTPTR_TYPE__ > -#define __UINTPTR_TYPE__ unsigned long > -#endif > - > -#endif /* _ASM_TYPES_H */ > diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h > new file mode 100644 > index 000000000000..9435a42f575e > --- /dev/null > +++ b/arch/arm/include/uapi/asm/types.h > @@ -0,0 +1,40 @@ > +#ifndef _UAPI_ASM_TYPES_H > +#define _UAPI_ASM_TYPES_H > + > +#include <asm-generic/int-ll64.h> > + > +/* > + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as > + * unambiguous on ARM as you would expect. For the types below, there is a > + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc > + * and the kernel itself, which results in build errors if you try to build with > + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' > + * in order to use NEON intrinsics) > + * > + * As the typedefs for these types in 'stdint.h' are based on builtin defines > + * supplied by GCC, we can tweak these to align with the kernel's idea of those > + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same > + * source file (provided that -ffreestanding is used). > + * > + * int32_t uint32_t uintptr_t > + * bare metal GCC long unsigned long unsigned int > + * glibc GCC int unsigned int unsigned int > + * kernel int unsigned int unsigned long > + */ > + > +#ifdef __INT32_TYPE__ > +#undef __INT32_TYPE__ > +#define __INT32_TYPE__ int > +#endif > + > +#ifdef __UINT32_TYPE__ > +#undef __UINT32_TYPE__ > +#define __UINT32_TYPE__ unsigned int > +#endif > + > +#ifdef __UINTPTR_TYPE__ > +#undef __UINTPTR_TYPE__ > +#define __UINTPTR_TYPE__ unsigned long > +#endif > + > +#endif /* _UAPI_ASM_TYPES_H */ > -- > 2.8.1 > -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 1/8] arm: put types.h in uapi 2017-01-13 10:46 ` Nicolas Dichtel ` (5 preceding siblings ...) (?) @ 2017-01-13 17:06 ` Russell King - ARM Linux -1 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-13 17:06 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa On Fri, Jan 13, 2017 at 11:46:39AM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. I'm taking this patch, but with the following commit log: Due to the way kbuild works, this header was unintentionally exported back in 2013 when it was created, despite it not being in a uapi/ directory. This is very non-intuitive behaviour by Kbuild. However, we've had this include exported to userland for almost four years, and searching google for "ARM types.h __UINTPTR_TYPE__" gives no hint that anyone has complained about it. So, let's make it officially exported in this state. If anyone has any objections, they better shout sooner rather than later. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > arch/arm/include/asm/types.h | 40 --------------------------------------- > arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 40 insertions(+), 40 deletions(-) > delete mode 100644 arch/arm/include/asm/types.h > create mode 100644 arch/arm/include/uapi/asm/types.h > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > deleted file mode 100644 > index a53cdb8f068c..000000000000 > --- a/arch/arm/include/asm/types.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -#ifndef _ASM_TYPES_H > -#define _ASM_TYPES_H > - > -#include <asm-generic/int-ll64.h> > - > -/* > - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as > - * unambiguous on ARM as you would expect. For the types below, there is a > - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc > - * and the kernel itself, which results in build errors if you try to build with > - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' > - * in order to use NEON intrinsics) > - * > - * As the typedefs for these types in 'stdint.h' are based on builtin defines > - * supplied by GCC, we can tweak these to align with the kernel's idea of those > - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same > - * source file (provided that -ffreestanding is used). > - * > - * int32_t uint32_t uintptr_t > - * bare metal GCC long unsigned long unsigned int > - * glibc GCC int unsigned int unsigned int > - * kernel int unsigned int unsigned long > - */ > - > -#ifdef __INT32_TYPE__ > -#undef __INT32_TYPE__ > -#define __INT32_TYPE__ int > -#endif > - > -#ifdef __UINT32_TYPE__ > -#undef __UINT32_TYPE__ > -#define __UINT32_TYPE__ unsigned int > -#endif > - > -#ifdef __UINTPTR_TYPE__ > -#undef __UINTPTR_TYPE__ > -#define __UINTPTR_TYPE__ unsigned long > -#endif > - > -#endif /* _ASM_TYPES_H */ > diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h > new file mode 100644 > index 000000000000..9435a42f575e > --- /dev/null > +++ b/arch/arm/include/uapi/asm/types.h > @@ -0,0 +1,40 @@ > +#ifndef _UAPI_ASM_TYPES_H > +#define _UAPI_ASM_TYPES_H > + > +#include <asm-generic/int-ll64.h> > + > +/* > + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as > + * unambiguous on ARM as you would expect. For the types below, there is a > + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc > + * and the kernel itself, which results in build errors if you try to build with > + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' > + * in order to use NEON intrinsics) > + * > + * As the typedefs for these types in 'stdint.h' are based on builtin defines > + * supplied by GCC, we can tweak these to align with the kernel's idea of those > + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same > + * source file (provided that -ffreestanding is used). > + * > + * int32_t uint32_t uintptr_t > + * bare metal GCC long unsigned long unsigned int > + * glibc GCC int unsigned int unsigned int > + * kernel int unsigned int unsigned long > + */ > + > +#ifdef __INT32_TYPE__ > +#undef __INT32_TYPE__ > +#define __INT32_TYPE__ int > +#endif > + > +#ifdef __UINT32_TYPE__ > +#undef __UINT32_TYPE__ > +#define __UINT32_TYPE__ unsigned int > +#endif > + > +#ifdef __UINTPTR_TYPE__ > +#undef __UINTPTR_TYPE__ > +#define __UINTPTR_TYPE__ unsigned long > +#endif > + > +#endif /* _UAPI_ASM_TYPES_H */ > -- > 2.8.1 > -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 1/8] arm: put types.h in uapi 2017-01-13 10:46 ` Nicolas Dichtel ` (2 preceding siblings ...) (?) @ 2017-01-13 17:06 ` Russell King - ARM Linux -1 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-13 17:06 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openri On Fri, Jan 13, 2017 at 11:46:39AM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. I'm taking this patch, but with the following commit log: Due to the way kbuild works, this header was unintentionally exported back in 2013 when it was created, despite it not being in a uapi/ directory. This is very non-intuitive behaviour by Kbuild. However, we've had this include exported to userland for almost four years, and searching google for "ARM types.h __UINTPTR_TYPE__" gives no hint that anyone has complained about it. So, let's make it officially exported in this state. If anyone has any objections, they better shout sooner rather than later. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > arch/arm/include/asm/types.h | 40 --------------------------------------- > arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 40 insertions(+), 40 deletions(-) > delete mode 100644 arch/arm/include/asm/types.h > create mode 100644 arch/arm/include/uapi/asm/types.h > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > deleted file mode 100644 > index a53cdb8f068c..000000000000 > --- a/arch/arm/include/asm/types.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -#ifndef _ASM_TYPES_H > -#define _ASM_TYPES_H > - > -#include <asm-generic/int-ll64.h> > - > -/* > - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as > - * unambiguous on ARM as you would expect. For the types below, there is a > - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc > - * and the kernel itself, which results in build errors if you try to build with > - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' > - * in order to use NEON intrinsics) > - * > - * As the typedefs for these types in 'stdint.h' are based on builtin defines > - * supplied by GCC, we can tweak these to align with the kernel's idea of those > - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same > - * source file (provided that -ffreestanding is used). > - * > - * int32_t uint32_t uintptr_t > - * bare metal GCC long unsigned long unsigned int > - * glibc GCC int unsigned int unsigned int > - * kernel int unsigned int unsigned long > - */ > - > -#ifdef __INT32_TYPE__ > -#undef __INT32_TYPE__ > -#define __INT32_TYPE__ int > -#endif > - > -#ifdef __UINT32_TYPE__ > -#undef __UINT32_TYPE__ > -#define __UINT32_TYPE__ unsigned int > -#endif > - > -#ifdef __UINTPTR_TYPE__ > -#undef __UINTPTR_TYPE__ > -#define __UINTPTR_TYPE__ unsigned long > -#endif > - > -#endif /* _ASM_TYPES_H */ > diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h > new file mode 100644 > index 000000000000..9435a42f575e > --- /dev/null > +++ b/arch/arm/include/uapi/asm/types.h > @@ -0,0 +1,40 @@ > +#ifndef _UAPI_ASM_TYPES_H > +#define _UAPI_ASM_TYPES_H > + > +#include <asm-generic/int-ll64.h> > + > +/* > + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as > + * unambiguous on ARM as you would expect. For the types below, there is a > + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc > + * and the kernel itself, which results in build errors if you try to build with > + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' > + * in order to use NEON intrinsics) > + * > + * As the typedefs for these types in 'stdint.h' are based on builtin defines > + * supplied by GCC, we can tweak these to align with the kernel's idea of those > + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same > + * source file (provided that -ffreestanding is used). > + * > + * int32_t uint32_t uintptr_t > + * bare metal GCC long unsigned long unsigned int > + * glibc GCC int unsigned int unsigned int > + * kernel int unsigned int unsigned long > + */ > + > +#ifdef __INT32_TYPE__ > +#undef __INT32_TYPE__ > +#define __INT32_TYPE__ int > +#endif > + > +#ifdef __UINT32_TYPE__ > +#undef __UINT32_TYPE__ > +#define __UINT32_TYPE__ unsigned int > +#endif > + > +#ifdef __UINTPTR_TYPE__ > +#undef __UINTPTR_TYPE__ > +#define __UINTPTR_TYPE__ unsigned long > +#endif > + > +#endif /* _UAPI_ASM_TYPES_H */ > -- > 2.8.1 > -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 17:06 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-13 17:06 UTC (permalink / raw) To: openrisc On Fri, Jan 13, 2017 at 11:46:39AM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. I'm taking this patch, but with the following commit log: Due to the way kbuild works, this header was unintentionally exported back in 2013 when it was created, despite it not being in a uapi/ directory. This is very non-intuitive behaviour by Kbuild. However, we've had this include exported to userland for almost four years, and searching google for "ARM types.h __UINTPTR_TYPE__" gives no hint that anyone has complained about it. So, let's make it officially exported in this state. If anyone has any objections, they better shout sooner rather than later. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > arch/arm/include/asm/types.h | 40 --------------------------------------- > arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 40 insertions(+), 40 deletions(-) > delete mode 100644 arch/arm/include/asm/types.h > create mode 100644 arch/arm/include/uapi/asm/types.h > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > deleted file mode 100644 > index a53cdb8f068c..000000000000 > --- a/arch/arm/include/asm/types.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -#ifndef _ASM_TYPES_H > -#define _ASM_TYPES_H > - > -#include <asm-generic/int-ll64.h> > - > -/* > - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as > - * unambiguous on ARM as you would expect. For the types below, there is a > - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc > - * and the kernel itself, which results in build errors if you try to build with > - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' > - * in order to use NEON intrinsics) > - * > - * As the typedefs for these types in 'stdint.h' are based on builtin defines > - * supplied by GCC, we can tweak these to align with the kernel's idea of those > - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same > - * source file (provided that -ffreestanding is used). > - * > - * int32_t uint32_t uintptr_t > - * bare metal GCC long unsigned long unsigned int > - * glibc GCC int unsigned int unsigned int > - * kernel int unsigned int unsigned long > - */ > - > -#ifdef __INT32_TYPE__ > -#undef __INT32_TYPE__ > -#define __INT32_TYPE__ int > -#endif > - > -#ifdef __UINT32_TYPE__ > -#undef __UINT32_TYPE__ > -#define __UINT32_TYPE__ unsigned int > -#endif > - > -#ifdef __UINTPTR_TYPE__ > -#undef __UINTPTR_TYPE__ > -#define __UINTPTR_TYPE__ unsigned long > -#endif > - > -#endif /* _ASM_TYPES_H */ > diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h > new file mode 100644 > index 000000000000..9435a42f575e > --- /dev/null > +++ b/arch/arm/include/uapi/asm/types.h > @@ -0,0 +1,40 @@ > +#ifndef _UAPI_ASM_TYPES_H > +#define _UAPI_ASM_TYPES_H > + > +#include <asm-generic/int-ll64.h> > + > +/* > + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as > + * unambiguous on ARM as you would expect. For the types below, there is a > + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc > + * and the kernel itself, which results in build errors if you try to build with > + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' > + * in order to use NEON intrinsics) > + * > + * As the typedefs for these types in 'stdint.h' are based on builtin defines > + * supplied by GCC, we can tweak these to align with the kernel's idea of those > + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same > + * source file (provided that -ffreestanding is used). > + * > + * int32_t uint32_t uintptr_t > + * bare metal GCC long unsigned long unsigned int > + * glibc GCC int unsigned int unsigned int > + * kernel int unsigned int unsigned long > + */ > + > +#ifdef __INT32_TYPE__ > +#undef __INT32_TYPE__ > +#define __INT32_TYPE__ int > +#endif > + > +#ifdef __UINT32_TYPE__ > +#undef __UINT32_TYPE__ > +#define __UINT32_TYPE__ unsigned int > +#endif > + > +#ifdef __UINTPTR_TYPE__ > +#undef __UINTPTR_TYPE__ > +#define __UINTPTR_TYPE__ unsigned long > +#endif > + > +#endif /* _UAPI_ASM_TYPES_H */ > -- > 2.8.1 > -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 17:06 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-13 17:06 UTC (permalink / raw) To: linux-snps-arc On Fri, Jan 13, 2017@11:46:39AM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. I'm taking this patch, but with the following commit log: Due to the way kbuild works, this header was unintentionally exported back in 2013 when it was created, despite it not being in a uapi/ directory. This is very non-intuitive behaviour by Kbuild. However, we've had this include exported to userland for almost four years, and searching google for "ARM types.h __UINTPTR_TYPE__" gives no hint that anyone has complained about it. So, let's make it officially exported in this state. If anyone has any objections, they better shout sooner rather than later. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> > --- > arch/arm/include/asm/types.h | 40 --------------------------------------- > arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 40 insertions(+), 40 deletions(-) > delete mode 100644 arch/arm/include/asm/types.h > create mode 100644 arch/arm/include/uapi/asm/types.h > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > deleted file mode 100644 > index a53cdb8f068c..000000000000 > --- a/arch/arm/include/asm/types.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -#ifndef _ASM_TYPES_H > -#define _ASM_TYPES_H > - > -#include <asm-generic/int-ll64.h> > - > -/* > - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as > - * unambiguous on ARM as you would expect. For the types below, there is a > - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc > - * and the kernel itself, which results in build errors if you try to build with > - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' > - * in order to use NEON intrinsics) > - * > - * As the typedefs for these types in 'stdint.h' are based on builtin defines > - * supplied by GCC, we can tweak these to align with the kernel's idea of those > - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same > - * source file (provided that -ffreestanding is used). > - * > - * int32_t uint32_t uintptr_t > - * bare metal GCC long unsigned long unsigned int > - * glibc GCC int unsigned int unsigned int > - * kernel int unsigned int unsigned long > - */ > - > -#ifdef __INT32_TYPE__ > -#undef __INT32_TYPE__ > -#define __INT32_TYPE__ int > -#endif > - > -#ifdef __UINT32_TYPE__ > -#undef __UINT32_TYPE__ > -#define __UINT32_TYPE__ unsigned int > -#endif > - > -#ifdef __UINTPTR_TYPE__ > -#undef __UINTPTR_TYPE__ > -#define __UINTPTR_TYPE__ unsigned long > -#endif > - > -#endif /* _ASM_TYPES_H */ > diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h > new file mode 100644 > index 000000000000..9435a42f575e > --- /dev/null > +++ b/arch/arm/include/uapi/asm/types.h > @@ -0,0 +1,40 @@ > +#ifndef _UAPI_ASM_TYPES_H > +#define _UAPI_ASM_TYPES_H > + > +#include <asm-generic/int-ll64.h> > + > +/* > + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as > + * unambiguous on ARM as you would expect. For the types below, there is a > + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc > + * and the kernel itself, which results in build errors if you try to build with > + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' > + * in order to use NEON intrinsics) > + * > + * As the typedefs for these types in 'stdint.h' are based on builtin defines > + * supplied by GCC, we can tweak these to align with the kernel's idea of those > + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same > + * source file (provided that -ffreestanding is used). > + * > + * int32_t uint32_t uintptr_t > + * bare metal GCC long unsigned long unsigned int > + * glibc GCC int unsigned int unsigned int > + * kernel int unsigned int unsigned long > + */ > + > +#ifdef __INT32_TYPE__ > +#undef __INT32_TYPE__ > +#define __INT32_TYPE__ int > +#endif > + > +#ifdef __UINT32_TYPE__ > +#undef __UINT32_TYPE__ > +#define __UINT32_TYPE__ unsigned int > +#endif > + > +#ifdef __UINTPTR_TYPE__ > +#undef __UINTPTR_TYPE__ > +#define __UINTPTR_TYPE__ unsigned long > +#endif > + > +#endif /* _UAPI_ASM_TYPES_H */ > -- > 2.8.1 > -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 17:06 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-13 17:06 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, bp, slash.tmp, daniel.vetter, msalter, jengelh, hch On Fri, Jan 13, 2017 at 11:46:39AM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. I'm taking this patch, but with the following commit log: Due to the way kbuild works, this header was unintentionally exported back in 2013 when it was created, despite it not being in a uapi/ directory. This is very non-intuitive behaviour by Kbuild. However, we've had this include exported to userland for almost four years, and searching google for "ARM types.h __UINTPTR_TYPE__" gives no hint that anyone has complained about it. So, let's make it officially exported in this state. If anyone has any objections, they better shout sooner rather than later. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > arch/arm/include/asm/types.h | 40 --------------------------------------- > arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 40 insertions(+), 40 deletions(-) > delete mode 100644 arch/arm/include/asm/types.h > create mode 100644 arch/arm/include/uapi/asm/types.h > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > deleted file mode 100644 > index a53cdb8f068c..000000000000 > --- a/arch/arm/include/asm/types.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -#ifndef _ASM_TYPES_H > -#define _ASM_TYPES_H > - > -#include <asm-generic/int-ll64.h> > - > -/* > - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as > - * unambiguous on ARM as you would expect. For the types below, there is a > - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc > - * and the kernel itself, which results in build errors if you try to build with > - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' > - * in order to use NEON intrinsics) > - * > - * As the typedefs for these types in 'stdint.h' are based on builtin defines > - * supplied by GCC, we can tweak these to align with the kernel's idea of those > - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same > - * source file (provided that -ffreestanding is used). > - * > - * int32_t uint32_t uintptr_t > - * bare metal GCC long unsigned long unsigned int > - * glibc GCC int unsigned int unsigned int > - * kernel int unsigned int unsigned long > - */ > - > -#ifdef __INT32_TYPE__ > -#undef __INT32_TYPE__ > -#define __INT32_TYPE__ int > -#endif > - > -#ifdef __UINT32_TYPE__ > -#undef __UINT32_TYPE__ > -#define __UINT32_TYPE__ unsigned int > -#endif > - > -#ifdef __UINTPTR_TYPE__ > -#undef __UINTPTR_TYPE__ > -#define __UINTPTR_TYPE__ unsigned long > -#endif > - > -#endif /* _ASM_TYPES_H */ > diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h > new file mode 100644 > index 000000000000..9435a42f575e > --- /dev/null > +++ b/arch/arm/include/uapi/asm/types.h > @@ -0,0 +1,40 @@ > +#ifndef _UAPI_ASM_TYPES_H > +#define _UAPI_ASM_TYPES_H > + > +#include <asm-generic/int-ll64.h> > + > +/* > + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as > + * unambiguous on ARM as you would expect. For the types below, there is a > + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc > + * and the kernel itself, which results in build errors if you try to build with > + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' > + * in order to use NEON intrinsics) > + * > + * As the typedefs for these types in 'stdint.h' are based on builtin defines > + * supplied by GCC, we can tweak these to align with the kernel's idea of those > + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same > + * source file (provided that -ffreestanding is used). > + * > + * int32_t uint32_t uintptr_t > + * bare metal GCC long unsigned long unsigned int > + * glibc GCC int unsigned int unsigned int > + * kernel int unsigned int unsigned long > + */ > + > +#ifdef __INT32_TYPE__ > +#undef __INT32_TYPE__ > +#define __INT32_TYPE__ int > +#endif > + > +#ifdef __UINT32_TYPE__ > +#undef __UINT32_TYPE__ > +#define __UINT32_TYPE__ unsigned int > +#endif > + > +#ifdef __UINTPTR_TYPE__ > +#undef __UINTPTR_TYPE__ > +#define __UINTPTR_TYPE__ unsigned long > +#endif > + > +#endif /* _UAPI_ASM_TYPES_H */ > -- > 2.8.1 > -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 17:06 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-13 17:06 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, bp, slash.tmp, daniel.vetter, msalter, jengelh, hch On Fri, Jan 13, 2017 at 11:46:39AM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. I'm taking this patch, but with the following commit log: Due to the way kbuild works, this header was unintentionally exported back in 2013 when it was created, despite it not being in a uapi/ directory. This is very non-intuitive behaviour by Kbuild. However, we've had this include exported to userland for almost four years, and searching google for "ARM types.h __UINTPTR_TYPE__" gives no hint that anyone has complained about it. So, let's make it officially exported in this state. If anyone has any objections, they better shout sooner rather than later. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > arch/arm/include/asm/types.h | 40 --------------------------------------- > arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 40 insertions(+), 40 deletions(-) > delete mode 100644 arch/arm/include/asm/types.h > create mode 100644 arch/arm/include/uapi/asm/types.h > > diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h > deleted file mode 100644 > index a53cdb8f068c..000000000000 > --- a/arch/arm/include/asm/types.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -#ifndef _ASM_TYPES_H > -#define _ASM_TYPES_H > - > -#include <asm-generic/int-ll64.h> > - > -/* > - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as > - * unambiguous on ARM as you would expect. For the types below, there is a > - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc > - * and the kernel itself, which results in build errors if you try to build with > - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' > - * in order to use NEON intrinsics) > - * > - * As the typedefs for these types in 'stdint.h' are based on builtin defines > - * supplied by GCC, we can tweak these to align with the kernel's idea of those > - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same > - * source file (provided that -ffreestanding is used). > - * > - * int32_t uint32_t uintptr_t > - * bare metal GCC long unsigned long unsigned int > - * glibc GCC int unsigned int unsigned int > - * kernel int unsigned int unsigned long > - */ > - > -#ifdef __INT32_TYPE__ > -#undef __INT32_TYPE__ > -#define __INT32_TYPE__ int > -#endif > - > -#ifdef __UINT32_TYPE__ > -#undef __UINT32_TYPE__ > -#define __UINT32_TYPE__ unsigned int > -#endif > - > -#ifdef __UINTPTR_TYPE__ > -#undef __UINTPTR_TYPE__ > -#define __UINTPTR_TYPE__ unsigned long > -#endif > - > -#endif /* _ASM_TYPES_H */ > diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h > new file mode 100644 > index 000000000000..9435a42f575e > --- /dev/null > +++ b/arch/arm/include/uapi/asm/types.h > @@ -0,0 +1,40 @@ > +#ifndef _UAPI_ASM_TYPES_H > +#define _UAPI_ASM_TYPES_H > + > +#include <asm-generic/int-ll64.h> > + > +/* > + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as > + * unambiguous on ARM as you would expect. For the types below, there is a > + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc > + * and the kernel itself, which results in build errors if you try to build with > + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' > + * in order to use NEON intrinsics) > + * > + * As the typedefs for these types in 'stdint.h' are based on builtin defines > + * supplied by GCC, we can tweak these to align with the kernel's idea of those > + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same > + * source file (provided that -ffreestanding is used). > + * > + * int32_t uint32_t uintptr_t > + * bare metal GCC long unsigned long unsigned int > + * glibc GCC int unsigned int unsigned int > + * kernel int unsigned int unsigned long > + */ > + > +#ifdef __INT32_TYPE__ > +#undef __INT32_TYPE__ > +#define __INT32_TYPE__ int > +#endif > + > +#ifdef __UINT32_TYPE__ > +#undef __UINT32_TYPE__ > +#define __UINT32_TYPE__ unsigned int > +#endif > + > +#ifdef __UINTPTR_TYPE__ > +#undef __UINTPTR_TYPE__ > +#define __UINTPTR_TYPE__ unsigned long > +#endif > + > +#endif /* _UAPI_ASM_TYPES_H */ > -- > 2.8.1 > -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 1/8] arm: put types.h in uapi 2017-01-13 10:46 ` Nicolas Dichtel ` (5 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/arm/include/asm/types.h | 40 --------------------------------------- arch/arm/include/uapi/asm/types.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 arch/arm/include/asm/types.h create mode 100644 arch/arm/include/uapi/asm/types.h diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h deleted file mode 100644 index a53cdb8f068c..000000000000 --- a/arch/arm/include/asm/types.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef _ASM_TYPES_H -#define _ASM_TYPES_H - -#include <asm-generic/int-ll64.h> - -/* - * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as - * unambiguous on ARM as you would expect. For the types below, there is a - * difference on ARM between GCC built for bare metal ARM, GCC built for glibc - * and the kernel itself, which results in build errors if you try to build with - * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' - * in order to use NEON intrinsics) - * - * As the typedefs for these types in 'stdint.h' are based on builtin defines - * supplied by GCC, we can tweak these to align with the kernel's idea of those - * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same - * source file (provided that -ffreestanding is used). - * - * int32_t uint32_t uintptr_t - * bare metal GCC long unsigned long unsigned int - * glibc GCC int unsigned int unsigned int - * kernel int unsigned int unsigned long - */ - -#ifdef __INT32_TYPE__ -#undef __INT32_TYPE__ -#define __INT32_TYPE__ int -#endif - -#ifdef __UINT32_TYPE__ -#undef __UINT32_TYPE__ -#define __UINT32_TYPE__ unsigned int -#endif - -#ifdef __UINTPTR_TYPE__ -#undef __UINTPTR_TYPE__ -#define __UINTPTR_TYPE__ unsigned long -#endif - -#endif /* _ASM_TYPES_H */ diff --git a/arch/arm/include/uapi/asm/types.h b/arch/arm/include/uapi/asm/types.h new file mode 100644 index 000000000000..9435a42f575e --- /dev/null +++ b/arch/arm/include/uapi/asm/types.h @@ -0,0 +1,40 @@ +#ifndef _UAPI_ASM_TYPES_H +#define _UAPI_ASM_TYPES_H + +#include <asm-generic/int-ll64.h> + +/* + * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as + * unambiguous on ARM as you would expect. For the types below, there is a + * difference on ARM between GCC built for bare metal ARM, GCC built for glibc + * and the kernel itself, which results in build errors if you try to build with + * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h' + * in order to use NEON intrinsics) + * + * As the typedefs for these types in 'stdint.h' are based on builtin defines + * supplied by GCC, we can tweak these to align with the kernel's idea of those + * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same + * source file (provided that -ffreestanding is used). + * + * int32_t uint32_t uintptr_t + * bare metal GCC long unsigned long unsigned int + * glibc GCC int unsigned int unsigned int + * kernel int unsigned int unsigned long + */ + +#ifdef __INT32_TYPE__ +#undef __INT32_TYPE__ +#define __INT32_TYPE__ int +#endif + +#ifdef __UINT32_TYPE__ +#undef __UINT32_TYPE__ +#define __UINT32_TYPE__ unsigned int +#endif + +#ifdef __UINTPTR_TYPE__ +#undef __UINTPTR_TYPE__ +#define __UINTPTR_TYPE__ unsigned long +#endif + +#endif /* _UAPI_ASM_TYPES_H */ -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 2/8] h8300: put bitsperlong.h in uapi 2017-01-13 10:46 ` Nicolas Dichtel ` (6 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 14 -------------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h deleted file mode 100644 index e140e46729ac..000000000000 --- a/arch/h8300/include/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __ASM_H8300_BITS_PER_LONG -#define __ASM_H8300_BITS_PER_LONG - -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif - -#endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 2/8] h8300: put bitsperlong.h in uapi 2017-01-13 10:46 ` Nicolas Dichtel ` (3 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 14 -------------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h deleted file mode 100644 index e140e46729ac..000000000000 --- a/arch/h8300/include/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __ASM_H8300_BITS_PER_LONG -#define __ASM_H8300_BITS_PER_LONG - -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif - -#endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v3 2/8] h8300: put bitsperlong.h in uapi @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: openrisc This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 14 -------------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h deleted file mode 100644 index e140e46729ac..000000000000 --- a/arch/h8300/include/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __ASM_H8300_BITS_PER_LONG -#define __ASM_H8300_BITS_PER_LONG - -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif - -#endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 2/8] h8300: put bitsperlong.h in uapi @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: linux-snps-arc This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 14 -------------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h deleted file mode 100644 index e140e46729ac..000000000000 --- a/arch/h8300/include/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __ASM_H8300_BITS_PER_LONG -#define __ASM_H8300_BITS_PER_LONG - -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif - -#endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 2/8] h8300: put bitsperlong.h in uapi @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 14 -------------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h deleted file mode 100644 index e140e46729ac..000000000000 --- a/arch/h8300/include/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __ASM_H8300_BITS_PER_LONG -#define __ASM_H8300_BITS_PER_LONG - -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif - -#endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 2/8] h8300: put bitsperlong.h in uapi @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 14 -------------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h deleted file mode 100644 index e140e46729ac..000000000000 --- a/arch/h8300/include/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __ASM_H8300_BITS_PER_LONG -#define __ASM_H8300_BITS_PER_LONG - -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif - -#endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 2/8] h8300: put bitsperlong.h in uapi @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 14 -------------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h deleted file mode 100644 index e140e46729ac..000000000000 --- a/arch/h8300/include/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __ASM_H8300_BITS_PER_LONG -#define __ASM_H8300_BITS_PER_LONG - -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif - -#endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 3/8] nios2: put setup.h in uapi 2017-01-13 10:46 ` Nicolas Dichtel ` (3 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch This header file is exported, but from a userland pov, it's just a wrapper to asm-generic/setup.h. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/nios2/include/uapi/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..69c965304146 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -2,4 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h +generic-y += setup.h generic-y += ucontext.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v3 3/8] nios2: put setup.h in uapi @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: openrisc This header file is exported, but from a userland pov, it's just a wrapper to asm-generic/setup.h. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/nios2/include/uapi/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..69c965304146 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -2,4 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h +generic-y += setup.h generic-y += ucontext.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 3/8] nios2: put setup.h in uapi @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: linux-snps-arc This header file is exported, but from a userland pov, it's just a wrapper to asm-generic/setup.h. Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> --- arch/nios2/include/uapi/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..69c965304146 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -2,4 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h +generic-y += setup.h generic-y += ucontext.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 3/8] nios2: put setup.h in uapi @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, Nicolas Dichtel This header file is exported, but from a userland pov, it's just a wrapper to asm-generic/setup.h. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/nios2/include/uapi/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..69c965304146 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -2,4 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h +generic-y += setup.h generic-y += ucontext.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 3/8] nios2: put setup.h in uapi @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, Nicolas Dichtel This header file is exported, but from a userland pov, it's just a wrapper to asm-generic/setup.h. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/nios2/include/uapi/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..69c965304146 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -2,4 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h +generic-y += setup.h generic-y += ucontext.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 3/8] nios2: put setup.h in uapi @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch This header file is exported, but from a userland pov, it's just a wrapper to asm-generic/setup.h. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/nios2/include/uapi/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..69c965304146 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -2,4 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h +generic-y += setup.h generic-y += ucontext.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v3 3/8] nios2: put setup.h in uapi 2017-01-13 10:46 ` Nicolas Dichtel ` (4 preceding siblings ...) (?) @ 2017-01-13 10:55 ` Tobias Klauser -1 siblings, 0 replies; 554+ messages in thread From: Tobias Klauser @ 2017-01-13 10:55 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k On 2017-01-13 at 11:46:41 +0100, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, but from a userland pov, it's just a wrapper > to asm-generic/setup.h. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: Tobias Klauser <tklauser@distanz.ch> _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 3/8] nios2: put setup.h in uapi 2017-01-13 10:46 ` Nicolas Dichtel ` (4 preceding siblings ...) (?) @ 2017-01-13 10:55 ` Tobias Klauser -1 siblings, 0 replies; 554+ messages in thread From: Tobias Klauser @ 2017-01-13 10:55 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa On 2017-01-13 at 11:46:41 +0100, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, but from a userland pov, it's just a wrapper > to asm-generic/setup.h. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: Tobias Klauser <tklauser@distanz.ch> ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v3 3/8] nios2: put setup.h in uapi @ 2017-01-13 10:55 ` Tobias Klauser 0 siblings, 0 replies; 554+ messages in thread From: Tobias Klauser @ 2017-01-13 10:55 UTC (permalink / raw) To: openrisc On 2017-01-13 at 11:46:41 +0100, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, but from a userland pov, it's just a wrapper > to asm-generic/setup.h. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: Tobias Klauser <tklauser@distanz.ch> ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 3/8] nios2: put setup.h in uapi @ 2017-01-13 10:55 ` Tobias Klauser 0 siblings, 0 replies; 554+ messages in thread From: Tobias Klauser @ 2017-01-13 10:55 UTC (permalink / raw) To: linux-snps-arc On 2017-01-13@11:46:41 +0100, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, but from a userland pov, it's just a wrapper > to asm-generic/setup.h. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> Reviewed-by: Tobias Klauser <tklauser at distanz.ch> ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 3/8] nios2: put setup.h in uapi @ 2017-01-13 10:55 ` Tobias Klauser 0 siblings, 0 replies; 554+ messages in thread From: Tobias Klauser @ 2017-01-13 10:55 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch On 2017-01-13 at 11:46:41 +0100, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, but from a userland pov, it's just a wrapper > to asm-generic/setup.h. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: Tobias Klauser <tklauser@distanz.ch> ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 3/8] nios2: put setup.h in uapi @ 2017-01-13 10:55 ` Tobias Klauser 0 siblings, 0 replies; 554+ messages in thread From: Tobias Klauser @ 2017-01-13 10:55 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch On 2017-01-13 at 11:46:41 +0100, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, but from a userland pov, it's just a wrapper > to asm-generic/setup.h. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: Tobias Klauser <tklauser@distanz.ch> ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 3/8] nios2: put setup.h in uapi @ 2017-01-13 10:55 ` Tobias Klauser 0 siblings, 0 replies; 554+ messages in thread From: Tobias Klauser @ 2017-01-13 10:55 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-ar On 2017-01-13 at 11:46:41 +0100, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, but from a userland pov, it's just a wrapper > to asm-generic/setup.h. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: Tobias Klauser <tklauser@distanz.ch> ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 3/8] nios2: put setup.h in uapi @ 2017-01-13 10:55 ` Tobias Klauser 0 siblings, 0 replies; 554+ messages in thread From: Tobias Klauser @ 2017-01-13 10:55 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa On 2017-01-13 at 11:46:41 +0100, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, but from a userland pov, it's just a wrapper > to asm-generic/setup.h. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: Tobias Klauser <tklauser@distanz.ch> ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 3/8] nios2: put setup.h in uapi 2017-01-13 10:46 ` Nicolas Dichtel ` (9 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k This header file is exported, but from a userland pov, it's just a wrapper to asm-generic/setup.h. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/nios2/include/uapi/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..69c965304146 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -2,4 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h +generic-y += setup.h generic-y += ucontext.h -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 4/8] x86: stop exporting msr-index.h to userland 2017-01-13 10:46 ` Nicolas Dichtel ` (3 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch Suggested-by: Borislav Petkov <bp@alien8.de> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/x86/include/uapi/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..1c532b3f18ea 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -27,7 +27,6 @@ header-y += ldt.h header-y += mce.h header-y += mman.h header-y += msgbuf.h -header-y += msr-index.h header-y += msr.h header-y += mtrr.h header-y += param.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v3 4/8] x86: stop exporting msr-index.h to userland @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: openrisc Suggested-by: Borislav Petkov <bp@alien8.de> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/x86/include/uapi/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..1c532b3f18ea 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -27,7 +27,6 @@ header-y += ldt.h header-y += mce.h header-y += mman.h header-y += msgbuf.h -header-y += msr-index.h header-y += msr.h header-y += mtrr.h header-y += param.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 4/8] x86: stop exporting msr-index.h to userland @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: linux-snps-arc Suggested-by: Borislav Petkov <bp at alien8.de> Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> --- arch/x86/include/uapi/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..1c532b3f18ea 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -27,7 +27,6 @@ header-y += ldt.h header-y += mce.h header-y += mman.h header-y += msgbuf.h -header-y += msr-index.h header-y += msr.h header-y += mtrr.h header-y += param.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 4/8] x86: stop exporting msr-index.h to userland @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, Nicolas Dichtel Suggested-by: Borislav Petkov <bp@alien8.de> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/x86/include/uapi/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..1c532b3f18ea 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -27,7 +27,6 @@ header-y += ldt.h header-y += mce.h header-y += mman.h header-y += msgbuf.h -header-y += msr-index.h header-y += msr.h header-y += mtrr.h header-y += param.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 4/8] x86: stop exporting msr-index.h to userland @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, Nicolas Dichtel Suggested-by: Borislav Petkov <bp@alien8.de> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/x86/include/uapi/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..1c532b3f18ea 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -27,7 +27,6 @@ header-y += ldt.h header-y += mce.h header-y += mman.h header-y += msgbuf.h -header-y += msr-index.h header-y += msr.h header-y += mtrr.h header-y += param.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 4/8] x86: stop exporting msr-index.h to userland @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch Suggested-by: Borislav Petkov <bp@alien8.de> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/x86/include/uapi/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..1c532b3f18ea 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -27,7 +27,6 @@ header-y += ldt.h header-y += mce.h header-y += mman.h header-y += msgbuf.h -header-y += msr-index.h header-y += msr.h header-y += mtrr.h header-y += param.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 4/8] x86: stop exporting msr-index.h to userland 2017-01-13 10:46 ` Nicolas Dichtel ` (11 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch Suggested-by: Borislav Petkov <bp@alien8.de> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/x86/include/uapi/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..1c532b3f18ea 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -27,7 +27,6 @@ header-y += ldt.h header-y += mce.h header-y += mman.h header-y += msgbuf.h -header-y += msr-index.h header-y += msr.h header-y += mtrr.h header-y += param.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 4/8] x86: stop exporting msr-index.h to userland 2017-01-13 10:46 ` Nicolas Dichtel ` (12 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k Suggested-by: Borislav Petkov <bp@alien8.de> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/x86/include/uapi/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..1c532b3f18ea 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -27,7 +27,6 @@ header-y += ldt.h header-y += mce.h header-y += mman.h header-y += msgbuf.h -header-y += msr-index.h header-y += msr.h header-y += mtrr.h header-y += param.h -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 5/8] Makefile.headersinst: cleanup input files 2017-01-13 10:46 ` Nicolas Dichtel ` (13 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that input-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 5/8] Makefile.headersinst: cleanup input files 2017-01-13 10:46 ` Nicolas Dichtel ` (3 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that input-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v3 5/8] Makefile.headersinst: cleanup input files @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: openrisc After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that input-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 5/8] Makefile.headersinst: cleanup input files @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: linux-snps-arc After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that input-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 5/8] Makefile.headersinst: cleanup input files @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, Nicolas Dichtel After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that input-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 5/8] Makefile.headersinst: cleanup input files @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, Nicolas Dichtel After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that input-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 5/8] Makefile.headersinst: cleanup input files @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that input-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 5/8] Makefile.headersinst: cleanup input files 2017-01-13 10:46 ` Nicolas Dichtel ` (15 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that input-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 6/8] Makefile.headersinst: remove destination-y option 2017-01-13 10:46 ` Nicolas Dichtel ` (16 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 6/8] Makefile.headersinst: remove destination-y option 2017-01-13 10:46 ` Nicolas Dichtel ` (4 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. == 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y == 8 Kbuild Variables == 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v3 6/8] Makefile.headersinst: remove destination-y option @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: openrisc This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 6/8] Makefile.headersinst: remove destination-y option @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: linux-snps-arc This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 6/8] Makefile.headersinst: remove destination-y option @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, Nicolas Dichtel This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 6/8] Makefile.headersinst: remove destination-y option @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, Nicolas Dichtel This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 6/8] Makefile.headersinst: remove destination-y option @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k VGhpcyBvcHRpb24gd2FzIGFkZGVkIGluIGNvbW1pdCBjN2JiMzQ5ZTdjMjUgKCJrYnVpbGQ6IGlu dHJvZHVjZSBkZXN0aW5hdGlvbi15CmZvciBleHBvcnRlZCBoZWFkZXJzIikgYnV0IG5ldmVyIHVz ZWQgaW4tdHJlZS4KClNpZ25lZC1vZmYtYnk6IE5pY29sYXMgRGljaHRlbCA8bmljb2xhcy5kaWNo dGVsQDZ3aW5kLmNvbT4KLS0tCiBEb2N1bWVudGF0aW9uL2tidWlsZC9tYWtlZmlsZXMudHh0IHwg MjMgKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIHNjcmlwdHMvTWFrZWZpbGUuaGVhZGVyc2luc3Qg ICAgICAgfCAgMiArLQogMiBmaWxlcyBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDIwIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24va2J1aWxkL21ha2VmaWxlcy50eHQg Yi9Eb2N1bWVudGF0aW9uL2tidWlsZC9tYWtlZmlsZXMudHh0CmluZGV4IDliOWM0Nzk3ZmM1NS4u MzdiNTI1ZDMyOWFlIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2tidWlsZC9tYWtlZmlsZXMu dHh0CisrKyBiL0RvY3VtZW50YXRpb24va2J1aWxkL21ha2VmaWxlcy50eHQKQEAgLTQ2LDkgKzQ2 LDggQEAgVGhpcyBkb2N1bWVudCBkZXNjcmliZXMgdGhlIExpbnV4IGtlcm5lbCBNYWtlZmlsZXMu CiAJPT09IDcgS2J1aWxkIHN5bnRheCBmb3IgZXhwb3J0ZWQgaGVhZGVycwogCQktLS0gNy4xIGhl YWRlci15CiAJCS0tLSA3LjIgZ2VuaGRyLXkKLQkJLS0tIDcuMyBkZXN0aW5hdGlvbi15Ci0JCS0t LSA3LjQgZ2VuZXJpYy15Ci0JCS0tLSA3LjUgZ2VuZXJhdGVkLXkKKwkJLS0tIDcuMyBnZW5lcmlj LXkKKwkJLS0tIDcuNCBnZW5lcmF0ZWQteQogCiAJPT09IDggS2J1aWxkIFZhcmlhYmxlcwogCT09 PSA5IE1ha2VmaWxlIGxhbmd1YWdlCkBAIC0xMjk1LDIxICsxMjk0LDcgQEAgU2VlIHN1YnNlcXVl bnQgY2hhcHRlciBmb3IgdGhlIHN5bnRheCBvZiB0aGUgS2J1aWxkIGZpbGUuCiAJCQkjaW5jbHVk ZS9saW51eC9LYnVpbGQKIAkJCWdlbmhkci15ICs9IHZlcnNpb24uaAogCi0JLS0tIDcuMyBkZXN0 aW5hdGlvbi15Ci0KLQlXaGVuIGFuIGFyY2hpdGVjdHVyZSBoYXMgYSBzZXQgb2YgZXhwb3J0ZWQg aGVhZGVycyB0aGF0IG5lZWRzIHRvIGJlCi0JZXhwb3J0ZWQgdG8gYSBkaWZmZXJlbnQgZGlyZWN0 b3J5IGRlc3RpbmF0aW9uLXkgaXMgdXNlZC4KLQlkZXN0aW5hdGlvbi15IHNwZWNpZmllcyB0aGUg ZGVzdGluYXRpb24gZGlyZWN0b3J5IGZvciBhbGwgZXhwb3J0ZWQKLQloZWFkZXJzIGluIHRoZSBm aWxlIHdoZXJlIGl0IGlzIHByZXNlbnQuCi0KLQkJRXhhbXBsZToKLQkJCSNhcmNoL3h0ZW5zYS9w bGF0Zm9ybXMvczYxMDUvaW5jbHVkZS9wbGF0Zm9ybS9LYnVpbGQKLQkJCWRlc3RpbmF0aW9uLXkg Oj0gaW5jbHVkZS9saW51eAotCi0JSW4gdGhlIGV4YW1wbGUgYWJvdmUgYWxsIGV4cG9ydGVkIGhl YWRlcnMgaW4gdGhlIEtidWlsZCBmaWxlCi0Jd2lsbCBiZSBsb2NhdGVkIGluIHRoZSBkaXJlY3Rv cnkgImluY2x1ZGUvbGludXgiIHdoZW4gZXhwb3J0ZWQuCi0KLQktLS0gNy40IGdlbmVyaWMteQor CS0tLSA3LjMgZ2VuZXJpYy15CiAKIAlJZiBhbiBhcmNoaXRlY3R1cmUgdXNlcyBhIHZlcmJhdGlt IGNvcHkgb2YgYSBoZWFkZXIgZnJvbQogCWluY2x1ZGUvYXNtLWdlbmVyaWMgdGhlbiB0aGlzIGlz IGxpc3RlZCBpbiB0aGUgZmlsZQpAQCAtMTMzNiw3ICsxMzIxLDcgQEAgU2VlIHN1YnNlcXVlbnQg Y2hhcHRlciBmb3IgdGhlIHN5bnRheCBvZiB0aGUgS2J1aWxkIGZpbGUuCiAJCUV4YW1wbGU6IHRl cm1pb3MuaAogCQkJI2luY2x1ZGUgPGFzbS1nZW5lcmljL3Rlcm1pb3MuaD4KIAotCS0tLSA3LjUg Z2VuZXJhdGVkLXkKKwktLS0gNy40IGdlbmVyYXRlZC15CiAKIAlJZiBhbiBhcmNoaXRlY3R1cmUg Z2VuZXJhdGVzIG90aGVyIGhlYWRlciBmaWxlcyBhbG9uZ3NpZGUgZ2VuZXJpYy15CiAJd3JhcHBl cnMsIGFuZCBub3QgaW5jbHVkZWQgaW4gZ2VuaGRyLXksIHRoZW4gZ2VuZXJhdGVkLXkgc3BlY2lm aWVzCmRpZmYgLS1naXQgYS9zY3JpcHRzL01ha2VmaWxlLmhlYWRlcnNpbnN0IGIvc2NyaXB0cy9N YWtlZmlsZS5oZWFkZXJzaW5zdAppbmRleCAzZTIwZDAzNDMyZDIuLjg3NmI0MmNmZWRlNCAxMDA2 NDQKLS0tIGEvc2NyaXB0cy9NYWtlZmlsZS5oZWFkZXJzaW5zdAorKysgYi9zY3JpcHRzL01ha2Vm aWxlLmhlYWRlcnNpbnN0CkBAIC0xNCw3ICsxNCw3IEBAIGtidWlsZC1maWxlIDo9ICQoc3JjdHJl ZSkvJChvYmopL0tidWlsZAogaW5jbHVkZSAkKGtidWlsZC1maWxlKQogCiAjIGNhbGxlZCBtYXkg c2V0IGRlc3RpbmF0aW9uIGRpciAod2hlbiBpbnN0YWxsaW5nIHRvIGFzbS8pCi1fZHN0IDo9ICQo aWYgJChkZXN0aW5hdGlvbi15KSwkKGRlc3RpbmF0aW9uLXkpLCQoaWYgJChkc3QpLCQoZHN0KSwk KG9iaikpKQorX2RzdCA6PSAkKGlmICQoZHN0KSwkKGRzdCksJChvYmopKQogCiBvbGQta2J1aWxk LWZpbGUgOj0gJChzcmN0cmVlKS8kKHN1YnN0IHVhcGkvLCwkKG9iaikpL0tidWlsZAogaWZuZXEg KCQod2lsZGNhcmQgJChvbGQta2J1aWxkLWZpbGUpKSwpCi0tIAoyLjguMQoKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxp c3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZl bAo= ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 6/8] Makefile.headersinst: remove destination-y option @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 7/8] uapi: export all headers under uapi directories 2017-01-13 10:46 ` Nicolas Dichtel ` (18 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h .install asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h linux/userio.h linux/pr.h linux/wil6210_uapi.h linux/a.out.h linux/nilfs2_ondisk.h linux/hash_info.h linux/seg6_genl.h linux/seg6_hmac.h linux/batman_adv.h linux/nsfs.h linux/qrtr.h linux/btrfs_tree.h linux/coresight-stm.h linux/dma-buf.h linux/module.h linux/lightnvm.h linux/nilfs2_api.h asm-cris/kvm_para.h asm-arc/kvm_para.h asm-arc/ucontext.h ..install.cmd asm-c6x/shmparam.h asm-c6x/ucontext.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. For the record, note that exported files for asm directories are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/<arch>/include/uapi/asm/Kbuild; - arch/<arch>/include/asm/Kbuild. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Mark Salter <msalter@redhat.com> --- Documentation/kbuild/makefiles.txt | 55 ++-- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 3 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 58 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 483 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 45 +-- 81 files changed, 92 insertions(+), 1745 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..51c072049e45 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,10 +44,11 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 mandatory-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y + --- 7.5 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1235,7 +1236,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1263,33 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. -See subsequent chapter for the syntax of the Kbuild file. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. - --- 7.1 header-y +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. +See subsequent chapter for the syntax of the Kbuild file. - header-y specifies header files to be exported. + --- 7.1 mandatory-y - Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm + to define the minimun set of headers that must be exported in + include/asm. - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y @@ -1334,6 +1331,18 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h + --- 7.5 subdir-y + + subdir-y may be used to specify a subdirectory to be exported. + + Example: + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ + + The convention is to list one subdir per line and + preferably in alphabetic order. + === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 69c965304146..374bd123329f 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,6 +1,5 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h - generic-y += setup.h generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y += - - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 1c532b3f18ea..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,61 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..8e6b335664f2 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +mandatory-y += auxvec.h +mandatory-y += bitsperlong.h +mandatory-y += byteorder.h +mandatory-y += errno.h +mandatory-y += fcntl.h +mandatory-y += ioctl.h +mandatory-y += ioctls.h +mandatory-y += ipcbuf.h +mandatory-y += mman.h +mandatory-y += msgbuf.h +mandatory-y += param.h +mandatory-y += poll.h +mandatory-y += posix_types.h +mandatory-y += ptrace.h +mandatory-y += resource.h +mandatory-y += sembuf.h +mandatory-y += setup.h +mandatory-y += shmbuf.h +mandatory-y += sigcontext.h +mandatory-y += siginfo.h +mandatory-y += signal.h +mandatory-y += socket.h +mandatory-y += sockios.h +mandatory-y += stat.h +mandatory-y += statfs.h +mandatory-y += swab.h +mandatory-y += termbits.h +mandatory-y += termios.h +mandatory-y += types.h +mandatory-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +mandatory-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index f330ba4547cf..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,483 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += timerfd.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..16ac3e71050e 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,19 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +27,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,25 +40,23 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) +ifneq ($(mandatory-y),) +missing := $(filter-out $(all-files),$(mandatory-y)) +ifneq ($(missing),) +$(error Some mandatory headers ($(missing)) are missing in $(obj)) +endif +endif # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -67,8 +70,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 7/8] uapi: export all headers under uapi directories 2017-01-13 10:46 ` Nicolas Dichtel ` (4 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h .install asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h linux/userio.h linux/pr.h linux/wil6210_uapi.h linux/a.out.h linux/nilfs2_ondisk.h linux/hash_info.h linux/seg6_genl.h linux/seg6_hmac.h linux/batman_adv.h linux/nsfs.h linux/qrtr.h linux/btrfs_tree.h linux/coresight-stm.h linux/dma-buf.h linux/module.h linux/lightnvm.h linux/nilfs2_api.h asm-cris/kvm_para.h asm-arc/kvm_para.h asm-arc/ucontext.h ..install.cmd asm-c6x/shmparam.h asm-c6x/ucontext.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. For the record, note that exported files for asm directories are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/<arch>/include/uapi/asm/Kbuild; - arch/<arch>/include/asm/Kbuild. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Mark Salter <msalter@redhat.com> --- Documentation/kbuild/makefiles.txt | 55 ++-- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 3 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 58 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 483 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 45 +-- 81 files changed, 92 insertions(+), 1745 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..51c072049e45 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,10 +44,11 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass == 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 mandatory-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y + --- 7.5 subdir-y == 8 Kbuild Variables == 9 Makefile language @@ -1235,7 +1236,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1263,33 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. -See subsequent chapter for the syntax of the Kbuild file. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. - --- 7.1 header-y +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. +See subsequent chapter for the syntax of the Kbuild file. - header-y specifies header files to be exported. + --- 7.1 mandatory-y - Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm + to define the minimun set of headers that must be exported in + include/asm. - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y @@ -1334,6 +1331,18 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h + --- 7.5 subdir-y + + subdir-y may be used to specify a subdirectory to be exported. + + Example: + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ + + The convention is to list one subdir per line and + preferably in alphabetic order. + == 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 69c965304146..374bd123329f 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,6 +1,5 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h - generic-y += setup.h generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y +- - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 1c532b3f18ea..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,61 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..8e6b335664f2 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +mandatory-y += auxvec.h +mandatory-y += bitsperlong.h +mandatory-y += byteorder.h +mandatory-y += errno.h +mandatory-y += fcntl.h +mandatory-y += ioctl.h +mandatory-y += ioctls.h +mandatory-y += ipcbuf.h +mandatory-y += mman.h +mandatory-y += msgbuf.h +mandatory-y += param.h +mandatory-y += poll.h +mandatory-y += posix_types.h +mandatory-y += ptrace.h +mandatory-y += resource.h +mandatory-y += sembuf.h +mandatory-y += setup.h +mandatory-y += shmbuf.h +mandatory-y += sigcontext.h +mandatory-y += siginfo.h +mandatory-y += signal.h +mandatory-y += socket.h +mandatory-y += sockios.h +mandatory-y += stat.h +mandatory-y += statfs.h +mandatory-y += swab.h +mandatory-y += termbits.h +mandatory-y += termios.h +mandatory-y += types.h +mandatory-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +mandatory-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index f330ba4547cf..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,483 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += timerfd.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..16ac3e71050e 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,19 @@ # ===================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ===================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +27,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,25 +40,23 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) +ifneq ($(mandatory-y),) +missing := $(filter-out $(all-files),$(mandatory-y)) +ifneq ($(missing),) +$(error Some mandatory headers ($(missing)) are missing in $(obj)) +endif +endif # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -67,8 +70,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v3 7/8] uapi: export all headers under uapi directories @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: openrisc Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h .install asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h linux/userio.h linux/pr.h linux/wil6210_uapi.h linux/a.out.h linux/nilfs2_ondisk.h linux/hash_info.h linux/seg6_genl.h linux/seg6_hmac.h linux/batman_adv.h linux/nsfs.h linux/qrtr.h linux/btrfs_tree.h linux/coresight-stm.h linux/dma-buf.h linux/module.h linux/lightnvm.h linux/nilfs2_api.h asm-cris/kvm_para.h asm-arc/kvm_para.h asm-arc/ucontext.h ..install.cmd asm-c6x/shmparam.h asm-c6x/ucontext.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. For the record, note that exported files for asm directories are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/<arch>/include/uapi/asm/Kbuild; - arch/<arch>/include/asm/Kbuild. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Mark Salter <msalter@redhat.com> --- Documentation/kbuild/makefiles.txt | 55 ++-- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 3 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 58 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 483 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 45 +-- 81 files changed, 92 insertions(+), 1745 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..51c072049e45 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,10 +44,11 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 mandatory-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y + --- 7.5 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1235,7 +1236,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1263,33 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. -See subsequent chapter for the syntax of the Kbuild file. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. - --- 7.1 header-y +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. +See subsequent chapter for the syntax of the Kbuild file. - header-y specifies header files to be exported. + --- 7.1 mandatory-y - Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm + to define the minimun set of headers that must be exported in + include/asm. - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y @@ -1334,6 +1331,18 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h + --- 7.5 subdir-y + + subdir-y may be used to specify a subdirectory to be exported. + + Example: + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ + + The convention is to list one subdir per line and + preferably in alphabetic order. + === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 69c965304146..374bd123329f 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,6 +1,5 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h - generic-y += setup.h generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y += - - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 1c532b3f18ea..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,61 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..8e6b335664f2 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +mandatory-y += auxvec.h +mandatory-y += bitsperlong.h +mandatory-y += byteorder.h +mandatory-y += errno.h +mandatory-y += fcntl.h +mandatory-y += ioctl.h +mandatory-y += ioctls.h +mandatory-y += ipcbuf.h +mandatory-y += mman.h +mandatory-y += msgbuf.h +mandatory-y += param.h +mandatory-y += poll.h +mandatory-y += posix_types.h +mandatory-y += ptrace.h +mandatory-y += resource.h +mandatory-y += sembuf.h +mandatory-y += setup.h +mandatory-y += shmbuf.h +mandatory-y += sigcontext.h +mandatory-y += siginfo.h +mandatory-y += signal.h +mandatory-y += socket.h +mandatory-y += sockios.h +mandatory-y += stat.h +mandatory-y += statfs.h +mandatory-y += swab.h +mandatory-y += termbits.h +mandatory-y += termios.h +mandatory-y += types.h +mandatory-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +mandatory-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index f330ba4547cf..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,483 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += timerfd.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..16ac3e71050e 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,19 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +27,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,25 +40,23 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) +ifneq ($(mandatory-y),) +missing := $(filter-out $(all-files),$(mandatory-y)) +ifneq ($(missing),) +$(error Some mandatory headers ($(missing)) are missing in $(obj)) +endif +endif # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -67,8 +70,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 7/8] uapi: export all headers under uapi directories @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: linux-snps-arc Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h .install asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h linux/userio.h linux/pr.h linux/wil6210_uapi.h linux/a.out.h linux/nilfs2_ondisk.h linux/hash_info.h linux/seg6_genl.h linux/seg6_hmac.h linux/batman_adv.h linux/nsfs.h linux/qrtr.h linux/btrfs_tree.h linux/coresight-stm.h linux/dma-buf.h linux/module.h linux/lightnvm.h linux/nilfs2_api.h asm-cris/kvm_para.h asm-arc/kvm_para.h asm-arc/ucontext.h ..install.cmd asm-c6x/shmparam.h asm-c6x/ucontext.h Thanks to Julien Floret <julien.floret at 6wind.com> for the tip to get all subdirs with a pure makefile command. For the record, note that exported files for asm directories are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/<arch>/include/uapi/asm/Kbuild; - arch/<arch>/include/asm/Kbuild. Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> Acked-by: Daniel Vetter <daniel.vetter at ffwll.ch> Acked-by: Russell King <rmk+kernel at armlinux.org.uk> Acked-by: Mark Salter <msalter at redhat.com> --- Documentation/kbuild/makefiles.txt | 55 ++-- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 3 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 58 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 483 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 45 +-- 81 files changed, 92 insertions(+), 1745 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..51c072049e45 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,10 +44,11 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 mandatory-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y + --- 7.5 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1235,7 +1236,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1263,33 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. -See subsequent chapter for the syntax of the Kbuild file. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. - --- 7.1 header-y +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. +See subsequent chapter for the syntax of the Kbuild file. - header-y specifies header files to be exported. + --- 7.1 mandatory-y - Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm + to define the minimun set of headers that must be exported in + include/asm. - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y @@ -1334,6 +1331,18 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h + --- 7.5 subdir-y + + subdir-y may be used to specify a subdirectory to be exported. + + Example: + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ + + The convention is to list one subdir per line and + preferably in alphabetic order. + === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 69c965304146..374bd123329f 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,6 +1,5 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h - generic-y += setup.h generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y += - - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 1c532b3f18ea..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,61 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..8e6b335664f2 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +mandatory-y += auxvec.h +mandatory-y += bitsperlong.h +mandatory-y += byteorder.h +mandatory-y += errno.h +mandatory-y += fcntl.h +mandatory-y += ioctl.h +mandatory-y += ioctls.h +mandatory-y += ipcbuf.h +mandatory-y += mman.h +mandatory-y += msgbuf.h +mandatory-y += param.h +mandatory-y += poll.h +mandatory-y += posix_types.h +mandatory-y += ptrace.h +mandatory-y += resource.h +mandatory-y += sembuf.h +mandatory-y += setup.h +mandatory-y += shmbuf.h +mandatory-y += sigcontext.h +mandatory-y += siginfo.h +mandatory-y += signal.h +mandatory-y += socket.h +mandatory-y += sockios.h +mandatory-y += stat.h +mandatory-y += statfs.h +mandatory-y += swab.h +mandatory-y += termbits.h +mandatory-y += termios.h +mandatory-y += types.h +mandatory-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +mandatory-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index f330ba4547cf..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,483 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += timerfd.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..16ac3e71050e 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,19 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +27,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,25 +40,23 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) +ifneq ($(mandatory-y),) +missing := $(filter-out $(all-files),$(mandatory-y)) +ifneq ($(missing),) +$(error Some mandatory headers ($(missing)) are missing in $(obj)) +endif +endif # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -67,8 +70,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 7/8] uapi: export all headers under uapi directories @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, Nicolas Dichtel Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h .install asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h linux/userio.h linux/pr.h linux/wil6210_uapi.h linux/a.out.h linux/nilfs2_ondisk.h linux/hash_info.h linux/seg6_genl.h linux/seg6_hmac.h linux/batman_adv.h linux/nsfs.h linux/qrtr.h linux/btrfs_tree.h linux/coresight-stm.h linux/dma-buf.h linux/module.h linux/lightnvm.h linux/nilfs2_api.h asm-cris/kvm_para.h asm-arc/kvm_para.h asm-arc/ucontext.h ..install.cmd asm-c6x/shmparam.h asm-c6x/ucontext.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. For the record, note that exported files for asm directories are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/<arch>/include/uapi/asm/Kbuild; - arch/<arch>/include/asm/Kbuild. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Mark Salter <msalter@redhat.com> --- Documentation/kbuild/makefiles.txt | 55 ++-- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 3 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 58 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 483 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 45 +-- 81 files changed, 92 insertions(+), 1745 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..51c072049e45 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,10 +44,11 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 mandatory-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y + --- 7.5 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1235,7 +1236,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1263,33 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. -See subsequent chapter for the syntax of the Kbuild file. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. - --- 7.1 header-y +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. +See subsequent chapter for the syntax of the Kbuild file. - header-y specifies header files to be exported. + --- 7.1 mandatory-y - Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm + to define the minimun set of headers that must be exported in + include/asm. - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y @@ -1334,6 +1331,18 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h + --- 7.5 subdir-y + + subdir-y may be used to specify a subdirectory to be exported. + + Example: + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ + + The convention is to list one subdir per line and + preferably in alphabetic order. + === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 69c965304146..374bd123329f 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,6 +1,5 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h - generic-y += setup.h generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y += - - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 1c532b3f18ea..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,61 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..8e6b335664f2 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +mandatory-y += auxvec.h +mandatory-y += bitsperlong.h +mandatory-y += byteorder.h +mandatory-y += errno.h +mandatory-y += fcntl.h +mandatory-y += ioctl.h +mandatory-y += ioctls.h +mandatory-y += ipcbuf.h +mandatory-y += mman.h +mandatory-y += msgbuf.h +mandatory-y += param.h +mandatory-y += poll.h +mandatory-y += posix_types.h +mandatory-y += ptrace.h +mandatory-y += resource.h +mandatory-y += sembuf.h +mandatory-y += setup.h +mandatory-y += shmbuf.h +mandatory-y += sigcontext.h +mandatory-y += siginfo.h +mandatory-y += signal.h +mandatory-y += socket.h +mandatory-y += sockios.h +mandatory-y += stat.h +mandatory-y += statfs.h +mandatory-y += swab.h +mandatory-y += termbits.h +mandatory-y += termios.h +mandatory-y += types.h +mandatory-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +mandatory-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index f330ba4547cf..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,483 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += timerfd.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..16ac3e71050e 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,19 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +27,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,25 +40,23 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) +ifneq ($(mandatory-y),) +missing := $(filter-out $(all-files),$(mandatory-y)) +ifneq ($(missing),) +$(error Some mandatory headers ($(missing)) are missing in $(obj)) +endif +endif # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -67,8 +70,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 7/8] uapi: export all headers under uapi directories @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, Nicolas Dichtel Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h .install asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h linux/userio.h linux/pr.h linux/wil6210_uapi.h linux/a.out.h linux/nilfs2_ondisk.h linux/hash_info.h linux/seg6_genl.h linux/seg6_hmac.h linux/batman_adv.h linux/nsfs.h linux/qrtr.h linux/btrfs_tree.h linux/coresight-stm.h linux/dma-buf.h linux/module.h linux/lightnvm.h linux/nilfs2_api.h asm-cris/kvm_para.h asm-arc/kvm_para.h asm-arc/ucontext.h ..install.cmd asm-c6x/shmparam.h asm-c6x/ucontext.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. For the record, note that exported files for asm directories are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/<arch>/include/uapi/asm/Kbuild; - arch/<arch>/include/asm/Kbuild. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Mark Salter <msalter@redhat.com> --- Documentation/kbuild/makefiles.txt | 55 ++-- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 3 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 58 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 483 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 45 +-- 81 files changed, 92 insertions(+), 1745 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..51c072049e45 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,10 +44,11 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 mandatory-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y + --- 7.5 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1235,7 +1236,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1263,33 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. -See subsequent chapter for the syntax of the Kbuild file. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. - --- 7.1 header-y +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. +See subsequent chapter for the syntax of the Kbuild file. - header-y specifies header files to be exported. + --- 7.1 mandatory-y - Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm + to define the minimun set of headers that must be exported in + include/asm. - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y @@ -1334,6 +1331,18 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h + --- 7.5 subdir-y + + subdir-y may be used to specify a subdirectory to be exported. + + Example: + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ + + The convention is to list one subdir per line and + preferably in alphabetic order. + === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 69c965304146..374bd123329f 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,6 +1,5 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h - generic-y += setup.h generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y += - - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 1c532b3f18ea..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,61 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..8e6b335664f2 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +mandatory-y += auxvec.h +mandatory-y += bitsperlong.h +mandatory-y += byteorder.h +mandatory-y += errno.h +mandatory-y += fcntl.h +mandatory-y += ioctl.h +mandatory-y += ioctls.h +mandatory-y += ipcbuf.h +mandatory-y += mman.h +mandatory-y += msgbuf.h +mandatory-y += param.h +mandatory-y += poll.h +mandatory-y += posix_types.h +mandatory-y += ptrace.h +mandatory-y += resource.h +mandatory-y += sembuf.h +mandatory-y += setup.h +mandatory-y += shmbuf.h +mandatory-y += sigcontext.h +mandatory-y += siginfo.h +mandatory-y += signal.h +mandatory-y += socket.h +mandatory-y += sockios.h +mandatory-y += stat.h +mandatory-y += statfs.h +mandatory-y += swab.h +mandatory-y += termbits.h +mandatory-y += termios.h +mandatory-y += types.h +mandatory-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +mandatory-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index f330ba4547cf..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,483 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += timerfd.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..16ac3e71050e 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,19 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +27,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,25 +40,23 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) +ifneq ($(mandatory-y),) +missing := $(filter-out $(all-files),$(mandatory-y)) +ifneq ($(missing),) +$(error Some mandatory headers ($(missing)) are missing in $(obj)) +endif +endif # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -67,8 +70,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 7/8] uapi: export all headers under uapi directories @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k UmVndWxhcmx5LCB3aGVuIGEgbmV3IGhlYWRlciBpcyBjcmVhdGVkIGluIGluY2x1ZGUvdWFwaS8s IHRoZSBkZXZlbG9wZXIKZm9yZ2V0cyB0byBhZGQgaXQgaW4gdGhlIGNvcnJlc3BvbmRpbmcgS2J1 aWxkIGZpbGUuIFRoaXMgZXJyb3IgaXMgdXN1YWxseQpkZXRlY3RlZCBhZnRlciB0aGUgcmVsZWFz ZSBpcyBvdXQuCgpJbiBmYWN0LCBhbGwgaGVhZGVycyB1bmRlciB1YXBpIGRpcmVjdG9yaWVzIHNo b3VsZCBiZSBleHBvcnRlZCwgdGh1cyBpdCdzCnVzZWxlc3MgdG8gaGF2ZSBhbiBleGhhdXN0aXZl IGxpc3QuCgpBZnRlciB0aGlzIHBhdGNoLCB0aGUgZm9sbG93aW5nIGZpbGVzLCB3aGljaCB3ZXJl IG5vdCBleHBvcnRlZCwgYXJlIG5vdwpleHBvcnRlZCAod2l0aCBtYWtlIGhlYWRlcnNfaW5zdGFs bF9hbGwpOgphc20tdW5pY29yZTMyL3NobXBhcmFtLmgKYXNtLXVuaWNvcmUzMi91Y29udGV4dC5o CmFzbS1oZXhhZ29uL3NobXBhcmFtLmgKYXNtLW1pcHMvdWNvbnRleHQuaAphc20tbWlwcy9od2Nh cC5oCmFzbS1taXBzL3JlZy5oCmRybS92Z2VtX2RybS5oCmRybS9hcm1hZGFfZHJtLmgKZHJtL29t YXBfZHJtLmgKZHJtL2V0bmF2aXZfZHJtLmgKYXNtLXRpbGUvc2htcGFyYW0uaAphc20tYmxhY2tm aW4vc2htcGFyYW0uaAphc20tYmxhY2tmaW4vdWNvbnRleHQuaAphc20tcG93ZXJwYy9wZXJmX3Jl Z3MuaApyZG1hL3FlZHItYWJpLmgKYXNtLXBhcmlzYy9rdm1fcGFyYS5oCmFzbS1vcGVucmlzYy9z aG1wYXJhbS5oCi5pbnN0YWxsCmFzbS1uaW9zMi9rdm1fcGFyYS5oCmFzbS1uaW9zMi91Y29udGV4 dC5oCmFzbS1zaC9rdm1fcGFyYS5oCmFzbS1zaC91Y29udGV4dC5oCmFzbS14dGVuc2Eva3ZtX3Bh cmEuaAphc20tYXZyMzIva3ZtX3BhcmEuaAphc20tbTMyci9rdm1fcGFyYS5oCmFzbS1oODMwMC9z aG1wYXJhbS5oCmFzbS1oODMwMC91Y29udGV4dC5oCmFzbS1tZXRhZy9rdm1fcGFyYS5oCmFzbS1t ZXRhZy9zaG1wYXJhbS5oCmFzbS1tZXRhZy91Y29udGV4dC5oCmFzbS1tNjhrL2t2bV9wYXJhLmgK YXNtLW02OGsvc2htcGFyYW0uaApsaW51eC9iY2FjaGUuaApsaW51eC9rdm0uaApsaW51eC9rdm1f cGFyYS5oCmxpbnV4L2tmZF9pb2N0bC5oCmxpbnV4L2NyeXB0b3VzZXIuaApsaW51eC9rY20uaAps aW51eC9rY292LmgKbGludXgvc2VnNl9pcHR1bm5lbC5oCmxpbnV4L3N0bS5oCmxpbnV4L2dlbndx ZQpsaW51eC9nZW53cWUvLmluc3RhbGwKbGludXgvZ2Vud3FlL2dlbndxZV9jYXJkLmgKbGludXgv Z2Vud3FlLy4uaW5zdGFsbC5jbWQKbGludXgvc2VnNi5oCmxpbnV4L2NpZnMKbGludXgvY2lmcy8u aW5zdGFsbApsaW51eC9jaWZzL2NpZnNfbW91bnQuaApsaW51eC9jaWZzLy4uaW5zdGFsbC5jbWQK bGludXgvYXV0b19kZXYtaW9jdGwuaApsaW51eC91c2VyaW8uaApsaW51eC9wci5oCmxpbnV4L3dp bDYyMTBfdWFwaS5oCmxpbnV4L2Eub3V0LmgKbGludXgvbmlsZnMyX29uZGlzay5oCmxpbnV4L2hh c2hfaW5mby5oCmxpbnV4L3NlZzZfZ2VubC5oCmxpbnV4L3NlZzZfaG1hYy5oCmxpbnV4L2JhdG1h bl9hZHYuaApsaW51eC9uc2ZzLmgKbGludXgvcXJ0ci5oCmxpbnV4L2J0cmZzX3RyZWUuaApsaW51 eC9jb3Jlc2lnaHQtc3RtLmgKbGludXgvZG1hLWJ1Zi5oCmxpbnV4L21vZHVsZS5oCmxpbnV4L2xp Z2h0bnZtLmgKbGludXgvbmlsZnMyX2FwaS5oCmFzbS1jcmlzL2t2bV9wYXJhLmgKYXNtLWFyYy9r dm1fcGFyYS5oCmFzbS1hcmMvdWNvbnRleHQuaAouLmluc3RhbGwuY21kCmFzbS1jNngvc2htcGFy YW0uaAphc20tYzZ4L3Vjb250ZXh0LmgKClRoYW5rcyB0byBKdWxpZW4gRmxvcmV0IDxqdWxpZW4u ZmxvcmV0QDZ3aW5kLmNvbT4gZm9yIHRoZSB0aXAgdG8gZ2V0IGFsbApzdWJkaXJzIHdpdGggYSBw dXJlIG1ha2VmaWxlIGNvbW1hbmQuCgpGb3IgdGhlIHJlY29yZCwgbm90ZSB0aGF0IGV4cG9ydGVk IGZpbGVzIGZvciBhc20gZGlyZWN0b3JpZXMgYXJlIGEgbWl4IG9mCmZpbGVzIGxpc3RlZCBieToK IC0gaW5jbHVkZS91YXBpL2FzbS1nZW5lcmljL0tidWlsZC5hc207CiAtIGFyY2gvPGFyY2g+L2lu Y2x1ZGUvdWFwaS9hc20vS2J1aWxkOwogLSBhcmNoLzxhcmNoPi9pbmNsdWRlL2FzbS9LYnVpbGQu CgpTaWduZWQtb2ZmLWJ5OiBOaWNvbGFzIERpY2h0ZWwgPG5pY29sYXMuZGljaHRlbEA2d2luZC5j b20+CkFja2VkLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpBY2tl ZC1ieTogUnVzc2VsbCBLaW5nIDxybWsra2VybmVsQGFybWxpbnV4Lm9yZy51az4KQWNrZWQtYnk6 IE1hcmsgU2FsdGVyIDxtc2FsdGVyQHJlZGhhdC5jb20+Ci0tLQogRG9jdW1lbnRhdGlvbi9rYnVp bGQvbWFrZWZpbGVzLnR4dCAgICAgICAgICB8ICA1NSArKy0tCiBhcmNoL2FscGhhL2luY2x1ZGUv dWFwaS9hc20vS2J1aWxkICAgICAgICAgIHwgIDQxIC0tLQogYXJjaC9hcmMvaW5jbHVkZS91YXBp L2FzbS9LYnVpbGQgICAgICAgICAgICB8ICAgMyAtCiBhcmNoL2FybS9pbmNsdWRlL3VhcGkvYXNt L0tidWlsZCAgICAgICAgICAgIHwgIDE3IC0KIGFyY2gvYXJtNjQvaW5jbHVkZS91YXBpL2FzbS9L YnVpbGQgICAgICAgICAgfCAgMTggLS0KIGFyY2gvYXZyMzIvaW5jbHVkZS91YXBpL2FzbS9LYnVp bGQgICAgICAgICAgfCAgMjAgLS0KIGFyY2gvYmxhY2tmaW4vaW5jbHVkZS91YXBpL2FzbS9LYnVp bGQgICAgICAgfCAgMTcgLQogYXJjaC9jNngvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgICAgICAg ICAgICB8ICAgOCAtCiBhcmNoL2NyaXMvaW5jbHVkZS91YXBpL2FyY2gtdjEwL2FyY2gvS2J1aWxk IHwgICA1IC0KIGFyY2gvY3Jpcy9pbmNsdWRlL3VhcGkvYXJjaC12MzIvYXJjaC9LYnVpbGQgfCAg IDMgLQogYXJjaC9jcmlzL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkICAgICAgICAgICB8ICA0MyAr LS0KIGFyY2gvZnJ2L2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkICAgICAgICAgICAgfCAgMzMgLS0K IGFyY2gvaDgzMDAvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgICAgICAgICAgfCAgMjggLS0KIGFy Y2gvaGV4YWdvbi9pbmNsdWRlL2FzbS9LYnVpbGQgICAgICAgICAgICAgfCAgIDMgLQogYXJjaC9o ZXhhZ29uL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkICAgICAgICB8ICAxMyAtCiBhcmNoL2lhNjQv aW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgICAgICAgICAgIHwgIDQ1IC0tLQogYXJjaC9tMzJyL2lu Y2x1ZGUvdWFwaS9hc20vS2J1aWxkICAgICAgICAgICB8ICAzMSAtLQogYXJjaC9tNjhrL2luY2x1 ZGUvdWFwaS9hc20vS2J1aWxkICAgICAgICAgICB8ICAyNCAtLQogYXJjaC9tZXRhZy9pbmNsdWRl L3VhcGkvYXNtL0tidWlsZCAgICAgICAgICB8ICAgOCAtCiBhcmNoL21pY3JvYmxhemUvaW5jbHVk ZS91YXBpL2FzbS9LYnVpbGQgICAgIHwgIDMyIC0tCiBhcmNoL21pcHMvaW5jbHVkZS91YXBpL2Fz bS9LYnVpbGQgICAgICAgICAgIHwgIDM3IC0tLQogYXJjaC9tbjEwMzAwL2luY2x1ZGUvdWFwaS9h c20vS2J1aWxkICAgICAgICB8ICAzMiAtLQogYXJjaC9uaW9zMi9pbmNsdWRlL3VhcGkvYXNtL0ti dWlsZCAgICAgICAgICB8ICAgMyArLQogYXJjaC9vcGVucmlzYy9pbmNsdWRlL2FzbS9LYnVpbGQg ICAgICAgICAgICB8ICAgMyAtCiBhcmNoL29wZW5yaXNjL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxk ICAgICAgIHwgICA4IC0KIGFyY2gvcGFyaXNjL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkICAgICAg ICAgfCAgMjggLS0KIGFyY2gvcG93ZXJwYy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCAgICAgICAg fCAgNDUgLS0tCiBhcmNoL3MzOTAvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgICAgICAgICAgIHwg IDUyIC0tLQogYXJjaC9zY29yZS9pbmNsdWRlL2FzbS9LYnVpbGQgICAgICAgICAgICAgICB8ICAg NCAtCiBhcmNoL3Njb3JlL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkICAgICAgICAgIHwgIDMyIC0t CiBhcmNoL3NoL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkICAgICAgICAgICAgIHwgIDIzIC0tCiBh cmNoL3NwYXJjL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkICAgICAgICAgIHwgIDQ4IC0tLQogYXJj aC90aWxlL2luY2x1ZGUvYXNtL0tidWlsZCAgICAgICAgICAgICAgICB8ICAgMyAtCiBhcmNoL3Rp bGUvaW5jbHVkZS91YXBpL2FyY2gvS2J1aWxkICAgICAgICAgIHwgIDE3IC0KIGFyY2gvdGlsZS9p bmNsdWRlL3VhcGkvYXNtL0tidWlsZCAgICAgICAgICAgfCAgMTkgKy0KIGFyY2gvdW5pY29yZTMy L2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkICAgICAgfCAgIDYgLQogYXJjaC94ODYvaW5jbHVkZS91 YXBpL2FzbS9LYnVpbGQgICAgICAgICAgICB8ICA1OCAtLS0tCiBhcmNoL3h0ZW5zYS9pbmNsdWRl L3VhcGkvYXNtL0tidWlsZCAgICAgICAgIHwgIDIzIC0tCiBpbmNsdWRlL0tidWlsZCAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHwgICAyIC0KIGluY2x1ZGUvYXNtLWdlbmVyaWMvS2J1aWxk LmFzbSAgICAgICAgICAgICAgfCAgIDEgLQogaW5jbHVkZS9zY3NpL2ZjL0tidWlsZCAgICAgICAg ICAgICAgICAgICAgICB8ICAgMAogaW5jbHVkZS91YXBpL0tidWlsZCAgICAgICAgICAgICAgICAg ICAgICAgICB8ICAxNSAtCiBpbmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMvS2J1aWxkICAgICAgICAg ICAgIHwgIDM2IC0tLQogaW5jbHVkZS91YXBpL2FzbS1nZW5lcmljL0tidWlsZC5hc20gICAgICAg ICB8ICA2MiArKy0tCiBpbmNsdWRlL3VhcGkvZHJtL0tidWlsZCAgICAgICAgICAgICAgICAgICAg IHwgIDIyIC0tCiBpbmNsdWRlL3VhcGkvbGludXgvS2J1aWxkICAgICAgICAgICAgICAgICAgIHwg NDgzIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGluY2x1ZGUvdWFwaS9saW51eC9hbmRy b2lkL0tidWlsZCAgICAgICAgICAgfCAgIDIgLQogaW5jbHVkZS91YXBpL2xpbnV4L2J5dGVvcmRl ci9LYnVpbGQgICAgICAgICB8ICAgMyAtCiBpbmNsdWRlL3VhcGkvbGludXgvY2FpZi9LYnVpbGQg ICAgICAgICAgICAgIHwgICAzIC0KIGluY2x1ZGUvdWFwaS9saW51eC9jYW4vS2J1aWxkICAgICAg ICAgICAgICAgfCAgIDYgLQogaW5jbHVkZS91YXBpL2xpbnV4L2R2Yi9LYnVpbGQgICAgICAgICAg ICAgICB8ICAgOSAtCiBpbmNsdWRlL3VhcGkvbGludXgvaGRsYy9LYnVpbGQgICAgICAgICAgICAg IHwgICAyIC0KIGluY2x1ZGUvdWFwaS9saW51eC9oc2kvS2J1aWxkICAgICAgICAgICAgICAgfCAg IDIgLQogaW5jbHVkZS91YXBpL2xpbnV4L2lpby9LYnVpbGQgICAgICAgICAgICAgICB8ICAgMyAt CiBpbmNsdWRlL3VhcGkvbGludXgvaXNkbi9LYnVpbGQgICAgICAgICAgICAgIHwgICAyIC0KIGlu Y2x1ZGUvdWFwaS9saW51eC9tbWMvS2J1aWxkICAgICAgICAgICAgICAgfCAgIDIgLQogaW5jbHVk ZS91YXBpL2xpbnV4L25ldGZpbHRlci9LYnVpbGQgICAgICAgICB8ICA4OSAtLS0tLQogaW5jbHVk ZS91YXBpL2xpbnV4L25ldGZpbHRlci9pcHNldC9LYnVpbGQgICB8ICAgNSAtCiBpbmNsdWRlL3Vh cGkvbGludXgvbmV0ZmlsdGVyX2FycC9LYnVpbGQgICAgIHwgICAzIC0KIGluY2x1ZGUvdWFwaS9s aW51eC9uZXRmaWx0ZXJfYnJpZGdlL0tidWlsZCAgfCAgMTggLS0KIGluY2x1ZGUvdWFwaS9saW51 eC9uZXRmaWx0ZXJfaXB2NC9LYnVpbGQgICAgfCAgMTAgLQogaW5jbHVkZS91YXBpL2xpbnV4L25l dGZpbHRlcl9pcHY2L0tidWlsZCAgICB8ICAxMyAtCiBpbmNsdWRlL3VhcGkvbGludXgvbmZzZC9L YnVpbGQgICAgICAgICAgICAgIHwgICA2IC0KIGluY2x1ZGUvdWFwaS9saW51eC9yYWlkL0tidWls ZCAgICAgICAgICAgICAgfCAgIDMgLQogaW5jbHVkZS91YXBpL2xpbnV4L3NwaS9LYnVpbGQgICAg ICAgICAgICAgICB8ICAgMiAtCiBpbmNsdWRlL3VhcGkvbGludXgvc3VucnBjL0tidWlsZCAgICAg ICAgICAgIHwgICAyIC0KIGluY2x1ZGUvdWFwaS9saW51eC90Y19hY3QvS2J1aWxkICAgICAgICAg ICAgfCAgMTUgLQogaW5jbHVkZS91YXBpL2xpbnV4L3RjX2VtYXRjaC9LYnVpbGQgICAgICAgICB8 ICAgNSAtCiBpbmNsdWRlL3VhcGkvbGludXgvdXNiL0tidWlsZCAgICAgICAgICAgICAgIHwgIDEy IC0KIGluY2x1ZGUvdWFwaS9saW51eC93aW1heC9LYnVpbGQgICAgICAgICAgICAgfCAgIDIgLQog aW5jbHVkZS91YXBpL21pc2MvS2J1aWxkICAgICAgICAgICAgICAgICAgICB8ICAgMiAtCiBpbmNs dWRlL3VhcGkvbXRkL0tidWlsZCAgICAgICAgICAgICAgICAgICAgIHwgICA2IC0KIGluY2x1ZGUv dWFwaS9yZG1hL0tidWlsZCAgICAgICAgICAgICAgICAgICAgfCAgMTggLS0KIGluY2x1ZGUvdWFw aS9yZG1hL2hmaS9LYnVpbGQgICAgICAgICAgICAgICAgfCAgIDIgLQogaW5jbHVkZS91YXBpL3Nj c2kvS2J1aWxkICAgICAgICAgICAgICAgICAgICB8ICAgNiAtCiBpbmNsdWRlL3VhcGkvc2NzaS9m Yy9LYnVpbGQgICAgICAgICAgICAgICAgIHwgICA1IC0KIGluY2x1ZGUvdWFwaS9zb3VuZC9LYnVp bGQgICAgICAgICAgICAgICAgICAgfCAgMTYgLQogaW5jbHVkZS91YXBpL3ZpZGVvL0tidWlsZCAg ICAgICAgICAgICAgICAgICB8ICAgNCAtCiBpbmNsdWRlL3VhcGkveGVuL0tidWlsZCAgICAgICAg ICAgICAgICAgICAgIHwgICA1IC0KIGluY2x1ZGUvdmlkZW8vS2J1aWxkICAgICAgICAgICAgICAg ICAgICAgICAgfCAgIDAKIHNjcmlwdHMvTWFrZWZpbGUuaGVhZGVyc2luc3QgICAgICAgICAgICAg ICAgfCAgNDUgKy0tCiA4MSBmaWxlcyBjaGFuZ2VkLCA5MiBpbnNlcnRpb25zKCspLCAxNzQ1IGRl bGV0aW9ucygtKQogZGVsZXRlIG1vZGUgMTAwNjQ0IGFyY2gvY3Jpcy9pbmNsdWRlL3VhcGkvYXJj aC12MTAvYXJjaC9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBhcmNoL2NyaXMvaW5jbHVkZS91 YXBpL2FyY2gtdjMyL2FyY2gvS2J1aWxkCiBkZWxldGUgbW9kZSAxMDA2NDQgYXJjaC90aWxlL2lu Y2x1ZGUvdWFwaS9hcmNoL0tidWlsZAogZGVsZXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUvS2J1aWxk CiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS9hc20tZ2VuZXJpYy9LYnVpbGQuYXNtCiBkZWxl dGUgbW9kZSAxMDA2NDQgaW5jbHVkZS9zY3NpL2ZjL0tidWlsZAogZGVsZXRlIG1vZGUgMTAwNjQ0 IGluY2x1ZGUvdWFwaS9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL3VhcGkvYXNt LWdlbmVyaWMvS2J1aWxkCiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS91YXBpL2RybS9LYnVp bGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL3VhcGkvbGludXgvS2J1aWxkCiBkZWxldGUg bW9kZSAxMDA2NDQgaW5jbHVkZS91YXBpL2xpbnV4L2FuZHJvaWQvS2J1aWxkCiBkZWxldGUgbW9k ZSAxMDA2NDQgaW5jbHVkZS91YXBpL2xpbnV4L2J5dGVvcmRlci9LYnVpbGQKIGRlbGV0ZSBtb2Rl IDEwMDY0NCBpbmNsdWRlL3VhcGkvbGludXgvY2FpZi9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0 NCBpbmNsdWRlL3VhcGkvbGludXgvY2FuL0tidWlsZAogZGVsZXRlIG1vZGUgMTAwNjQ0IGluY2x1 ZGUvdWFwaS9saW51eC9kdmIvS2J1aWxkCiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS91YXBp L2xpbnV4L2hkbGMvS2J1aWxkCiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS91YXBpL2xpbnV4 L2hzaS9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL3VhcGkvbGludXgvaWlvL0ti dWlsZAogZGVsZXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUvdWFwaS9saW51eC9pc2RuL0tidWlsZAog ZGVsZXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUvdWFwaS9saW51eC9tbWMvS2J1aWxkCiBkZWxldGUg bW9kZSAxMDA2NDQgaW5jbHVkZS91YXBpL2xpbnV4L25ldGZpbHRlci9LYnVpbGQKIGRlbGV0ZSBt b2RlIDEwMDY0NCBpbmNsdWRlL3VhcGkvbGludXgvbmV0ZmlsdGVyL2lwc2V0L0tidWlsZAogZGVs ZXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUvdWFwaS9saW51eC9uZXRmaWx0ZXJfYXJwL0tidWlsZAog ZGVsZXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUvdWFwaS9saW51eC9uZXRmaWx0ZXJfYnJpZGdlL0ti dWlsZAogZGVsZXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUvdWFwaS9saW51eC9uZXRmaWx0ZXJfaXB2 NC9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL3VhcGkvbGludXgvbmV0ZmlsdGVy X2lwdjYvS2J1aWxkCiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS91YXBpL2xpbnV4L25mc2Qv S2J1aWxkCiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS91YXBpL2xpbnV4L3JhaWQvS2J1aWxk CiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS91YXBpL2xpbnV4L3NwaS9LYnVpbGQKIGRlbGV0 ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL3VhcGkvbGludXgvc3VucnBjL0tidWlsZAogZGVsZXRlIG1v ZGUgMTAwNjQ0IGluY2x1ZGUvdWFwaS9saW51eC90Y19hY3QvS2J1aWxkCiBkZWxldGUgbW9kZSAx MDA2NDQgaW5jbHVkZS91YXBpL2xpbnV4L3RjX2VtYXRjaC9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEw MDY0NCBpbmNsdWRlL3VhcGkvbGludXgvdXNiL0tidWlsZAogZGVsZXRlIG1vZGUgMTAwNjQ0IGlu Y2x1ZGUvdWFwaS9saW51eC93aW1heC9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBpbmNsdWRl L3VhcGkvbWlzYy9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL3VhcGkvbXRkL0ti dWlsZAogZGVsZXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUvdWFwaS9yZG1hL0tidWlsZAogZGVsZXRl IG1vZGUgMTAwNjQ0IGluY2x1ZGUvdWFwaS9yZG1hL2hmaS9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEw MDY0NCBpbmNsdWRlL3VhcGkvc2NzaS9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBpbmNsdWRl L3VhcGkvc2NzaS9mYy9LYnVpbGQKIGRlbGV0ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL3VhcGkvc291 bmQvS2J1aWxkCiBkZWxldGUgbW9kZSAxMDA2NDQgaW5jbHVkZS91YXBpL3ZpZGVvL0tidWlsZAog ZGVsZXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUvdWFwaS94ZW4vS2J1aWxkCiBkZWxldGUgbW9kZSAx MDA2NDQgaW5jbHVkZS92aWRlby9LYnVpbGQKCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2ti dWlsZC9tYWtlZmlsZXMudHh0IGIvRG9jdW1lbnRhdGlvbi9rYnVpbGQvbWFrZWZpbGVzLnR4dApp bmRleCAzN2I1MjVkMzI5YWUuLjUxYzA3MjA0OWU0NSAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlv bi9rYnVpbGQvbWFrZWZpbGVzLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2tidWlsZC9tYWtlZmls ZXMudHh0CkBAIC00NCwxMCArNDQsMTEgQEAgVGhpcyBkb2N1bWVudCBkZXNjcmliZXMgdGhlIExp bnV4IGtlcm5lbCBNYWtlZmlsZXMuCiAJICAgLS0tIDYuMTEgUG9zdC1saW5rIHBhc3MKIAogCT09 PSA3IEtidWlsZCBzeW50YXggZm9yIGV4cG9ydGVkIGhlYWRlcnMKLQkJLS0tIDcuMSBoZWFkZXIt eQorCQktLS0gNy4xIG1hbmRhdG9yeS15CiAJCS0tLSA3LjIgZ2VuaGRyLXkKIAkJLS0tIDcuMyBn ZW5lcmljLXkKIAkJLS0tIDcuNCBnZW5lcmF0ZWQteQorCQktLS0gNy41IHN1YmRpci15CiAKIAk9 PT0gOCBLYnVpbGQgVmFyaWFibGVzCiAJPT09IDkgTWFrZWZpbGUgbGFuZ3VhZ2UKQEAgLTEyMzUs NyArMTIzNiw3IEBAIFdoZW4ga2J1aWxkIGV4ZWN1dGVzLCB0aGUgZm9sbG93aW5nIHN0ZXBzIGFy ZSBmb2xsb3dlZCAocm91Z2hseSk6CiAJdGhhdCBtYXkgYmUgc2hhcmVkIGJldHdlZW4gaW5kaXZp ZHVhbCBhcmNoaXRlY3R1cmVzLgogCVRoZSByZWNvbW1lbmRlZCBhcHByb2FjaCBob3cgdG8gdXNl IGEgZ2VuZXJpYyBoZWFkZXIgZmlsZSBpcwogCXRvIGxpc3QgdGhlIGZpbGUgaW4gdGhlIEtidWls ZCBmaWxlLgotCVNlZSAiNy40IGdlbmVyaWMteSIgZm9yIGZ1cnRoZXIgaW5mbyBvbiBzeW50YXgg ZXRjLgorCVNlZSAiNy4zIGdlbmVyaWMteSIgZm9yIGZ1cnRoZXIgaW5mbyBvbiBzeW50YXggZXRj LgogCiAtLS0gNi4xMSBQb3N0LWxpbmsgcGFzcwogCkBAIC0xMjYyLDM3ICsxMjYzLDMzIEBAIFRo ZSBwcmUtcHJvY2Vzc2luZyBkb2VzOgogLSBkcm9wIGluY2x1ZGUgb2YgY29tcGlsZXIuaAogLSBk cm9wIGFsbCBzZWN0aW9ucyB0aGF0IGFyZSBrZXJuZWwgaW50ZXJuYWwgKGd1YXJkZWQgYnkgaWZk ZWYgX19LRVJORUxfXykKIAotRWFjaCByZWxldmFudCBkaXJlY3RvcnkgY29udGFpbnMgYSBmaWxl IG5hbWUgIktidWlsZCIgd2hpY2ggc3BlY2lmaWVzIHRoZQotaGVhZGVycyB0byBiZSBleHBvcnRl ZC4KLVNlZSBzdWJzZXF1ZW50IGNoYXB0ZXIgZm9yIHRoZSBzeW50YXggb2YgdGhlIEtidWlsZCBm aWxlLgorQWxsIGhlYWRlcnMgdW5kZXIgaW5jbHVkZS91YXBpLywgaW5jbHVkZS9nZW5lcmF0ZWQv dWFwaS8sCithcmNoLzxhcmNoPi9pbmNsdWRlL3VhcGkvYXNtLyBhbmQgYXJjaC88YXJjaD4vaW5j bHVkZS9nZW5lcmF0ZWQvdWFwaS9hc20vCithcmUgZXhwb3J0ZWQuCiAKLQktLS0gNy4xIGhlYWRl ci15CitBIEtidWlsZCBmaWxlIG1heSBiZSBkZWZpbmVkIHVuZGVyIGFyY2gvPGFyY2g+L2luY2x1 ZGUvdWFwaS9hc20vIGFuZAorYXJjaC88YXJjaD4vaW5jbHVkZS9hc20vIHRvIGxpc3QgYXNtIGZp bGVzIGNvbWluZyBmcm9tIGFzbS1nZW5lcmljLgorU2VlIHN1YnNlcXVlbnQgY2hhcHRlciBmb3Ig dGhlIHN5bnRheCBvZiB0aGUgS2J1aWxkIGZpbGUuCiAKLQloZWFkZXIteSBzcGVjaWZpZXMgaGVh ZGVyIGZpbGVzIHRvIGJlIGV4cG9ydGVkLgorCS0tLSA3LjEgbWFuZGF0b3J5LXkKIAotCQlFeGFt cGxlOgotCQkJI2luY2x1ZGUvbGludXgvS2J1aWxkCi0JCQloZWFkZXIteSArPSB1c2IvCi0JCQlo ZWFkZXIteSArPSBhaW9fYWJpLmgKKwltYW5kYXRvcnkteSBpcyBlc3NlbnRpYWxseSB1c2VkIGJ5 IGluY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVpbGQuYXNtCisJdG8gZGVmaW5lIHRoZSBtaW5p bXVuIHNldCBvZiBoZWFkZXJzIHRoYXQgbXVzdCBiZSBleHBvcnRlZCBpbgorCWluY2x1ZGUvYXNt LgogCi0JVGhlIGNvbnZlbnRpb24gaXMgdG8gbGlzdCBvbmUgZmlsZSBwZXIgbGluZSBhbmQKKwlU aGUgY29udmVudGlvbiBpcyB0byBsaXN0IG9uZSBzdWJkaXIgcGVyIGxpbmUgYW5kCiAJcHJlZmVy YWJseSBpbiBhbHBoYWJldGljIG9yZGVyLgogCi0JaGVhZGVyLXkgYWxzbyBzcGVjaWZpZXMgd2hp Y2ggc3ViZGlyZWN0b3JpZXMgdG8gdmlzaXQuCi0JQSBzdWJkaXJlY3RvcnkgaXMgaWRlbnRpZmll ZCBieSBhIHRyYWlsaW5nICcvJyB3aGljaAotCWNhbiBiZSBzZWVuIGluIHRoZSBleGFtcGxlIGFi b3ZlIGZvciB0aGUgdXNiIHN1YmRpcmVjdG9yeS4KLQotCVN1YmRpcmVjdG9yaWVzIGFyZSB2aXNp dGVkIGJlZm9yZSB0aGVpciBwYXJlbnQgZGlyZWN0b3JpZXMuCi0KIAktLS0gNy4yIGdlbmhkci15 CiAKLQlnZW5oZHIteSBzcGVjaWZpZXMgZ2VuZXJhdGVkIGZpbGVzIHRvIGJlIGV4cG9ydGVkLgot CUdlbmVyYXRlZCBmaWxlcyBhcmUgc3BlY2lhbCBhcyB0aGV5IG5lZWQgdG8gYmUgbG9va2VkCi0J dXAgaW4gYW5vdGhlciBkaXJlY3Rvcnkgd2hlbiBkb2luZyAnbWFrZSBPPS4uLicgYnVpbGRzLgor CWdlbmhkci15IHNwZWNpZmllcyBhc20gZmlsZXMgdG8gYmUgZ2VuZXJhdGVkLgogCiAJCUV4YW1w bGU6Ci0JCQkjaW5jbHVkZS9saW51eC9LYnVpbGQKLQkJCWdlbmhkci15ICs9IHZlcnNpb24uaAor CQkJI2FyY2gveDg2L2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCisJCQlnZW5oZHIteSArPSB1bmlz dGRfMzIuaAorCQkJZ2VuaGRyLXkgKz0gdW5pc3RkXzY0LmgKKwkJCWdlbmhkci15ICs9IHVuaXN0 ZF94MzIuaAorCiAKIAktLS0gNy4zIGdlbmVyaWMteQogCkBAIC0xMzM0LDYgKzEzMzEsMTggQEAg U2VlIHN1YnNlcXVlbnQgY2hhcHRlciBmb3IgdGhlIHN5bnRheCBvZiB0aGUgS2J1aWxkIGZpbGUu CiAJCQkjYXJjaC94ODYvaW5jbHVkZS9hc20vS2J1aWxkCiAJCQlnZW5lcmF0ZWQteSArPSBzeXNj YWxsc18zMi5oCiAKKwktLS0gNy41IHN1YmRpci15CisKKwlzdWJkaXIteSBtYXkgYmUgdXNlZCB0 byBzcGVjaWZ5IGEgc3ViZGlyZWN0b3J5IHRvIGJlIGV4cG9ydGVkLgorCisJCUV4YW1wbGU6CisJ CQkjYXJjaC9jcmlzL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCisJCQlzdWJkaXIteSArPSAuLi9h cmNoLXYxMC9hcmNoLworCQkJc3ViZGlyLXkgKz0gLi4vYXJjaC12MzIvYXJjaC8KKworCVRoZSBj b252ZW50aW9uIGlzIHRvIGxpc3Qgb25lIHN1YmRpciBwZXIgbGluZSBhbmQKKwlwcmVmZXJhYmx5 IGluIGFscGhhYmV0aWMgb3JkZXIuCisKID09PSA4IEtidWlsZCBWYXJpYWJsZXMKIAogVGhlIHRv cCBNYWtlZmlsZSBleHBvcnRzIHRoZSBmb2xsb3dpbmcgdmFyaWFibGVzOgpkaWZmIC0tZ2l0IGEv YXJjaC9hbHBoYS9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCBiL2FyY2gvYWxwaGEvaW5jbHVkZS91 YXBpL2FzbS9LYnVpbGQKaW5kZXggZDk2ZjJlZjViNjM5Li5iMTViZjZiYzBlOTQgMTAwNjQ0Ci0t LSBhL2FyY2gvYWxwaGEvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKKysrIGIvYXJjaC9hbHBoYS9p bmNsdWRlL3VhcGkvYXNtL0tidWlsZApAQCAtMSw0MyArMSwyIEBACiAjIFVBUEkgSGVhZGVyIGV4 cG9ydCBsaXN0CiBpbmNsdWRlIGluY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVpbGQuYXNtCi0K LWhlYWRlci15ICs9IGEub3V0LmgKLWhlYWRlci15ICs9IGF1eHZlYy5oCi1oZWFkZXIteSArPSBi aXRzcGVybG9uZy5oCi1oZWFkZXIteSArPSBieXRlb3JkZXIuaAotaGVhZGVyLXkgKz0gY29tcGls ZXIuaAotaGVhZGVyLXkgKz0gY29uc29sZS5oCi1oZWFkZXIteSArPSBlcnJuby5oCi1oZWFkZXIt eSArPSBmY250bC5oCi1oZWFkZXIteSArPSBmcHUuaAotaGVhZGVyLXkgKz0gZ2VudHJhcC5oCi1o ZWFkZXIteSArPSBpb2N0bC5oCi1oZWFkZXIteSArPSBpb2N0bHMuaAotaGVhZGVyLXkgKz0gaXBj YnVmLmgKLWhlYWRlci15ICs9IGt2bV9wYXJhLmgKLWhlYWRlci15ICs9IG1tYW4uaAotaGVhZGVy LXkgKz0gbXNnYnVmLmgKLWhlYWRlci15ICs9IHBhbC5oCi1oZWFkZXIteSArPSBwYXJhbS5oCi1o ZWFkZXIteSArPSBwb2xsLmgKLWhlYWRlci15ICs9IHBvc2l4X3R5cGVzLmgKLWhlYWRlci15ICs9 IHB0cmFjZS5oCi1oZWFkZXIteSArPSByZWcuaAotaGVhZGVyLXkgKz0gcmVnZGVmLmgKLWhlYWRl ci15ICs9IHJlc291cmNlLmgKLWhlYWRlci15ICs9IHNlbWJ1Zi5oCi1oZWFkZXIteSArPSBzZXR1 cC5oCi1oZWFkZXIteSArPSBzaG1idWYuaAotaGVhZGVyLXkgKz0gc2lnY29udGV4dC5oCi1oZWFk ZXIteSArPSBzaWdpbmZvLmgKLWhlYWRlci15ICs9IHNpZ25hbC5oCi1oZWFkZXIteSArPSBzb2Nr ZXQuaAotaGVhZGVyLXkgKz0gc29ja2lvcy5oCi1oZWFkZXIteSArPSBzdGF0LmgKLWhlYWRlci15 ICs9IHN0YXRmcy5oCi1oZWFkZXIteSArPSBzd2FiLmgKLWhlYWRlci15ICs9IHN5c2luZm8uaAot aGVhZGVyLXkgKz0gdGVybWJpdHMuaAotaGVhZGVyLXkgKz0gdGVybWlvcy5oCi1oZWFkZXIteSAr PSB0eXBlcy5oCi1oZWFkZXIteSArPSB1bmlzdGQuaApkaWZmIC0tZ2l0IGEvYXJjaC9hcmMvaW5j bHVkZS91YXBpL2FzbS9LYnVpbGQgYi9hcmNoL2FyYy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZApp bmRleCBmNTBkMDJkZjc4ZDUuLmIxNWJmNmJjMGU5NCAxMDA2NDQKLS0tIGEvYXJjaC9hcmMvaW5j bHVkZS91YXBpL2FzbS9LYnVpbGQKKysrIGIvYXJjaC9hcmMvaW5jbHVkZS91YXBpL2FzbS9LYnVp bGQKQEAgLTEsNSArMSwyIEBACiAjIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0CiBpbmNsdWRlIGlu Y2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVpbGQuYXNtCi1oZWFkZXIteSArPSBlbGYuaAotaGVh ZGVyLXkgKz0gcGFnZS5oCi1oZWFkZXIteSArPSBjYWNoZWN0bC5oCmRpZmYgLS1naXQgYS9hcmNo L2FybS9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCBiL2FyY2gvYXJtL2luY2x1ZGUvdWFwaS9hc20v S2J1aWxkCmluZGV4IDQ2YTc2Y2Q2YWNiNi4uNjA3ZjcwMmMyZDYyIDEwMDY0NAotLS0gYS9hcmNo L2FybS9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAorKysgYi9hcmNoL2FybS9pbmNsdWRlL3VhcGkv YXNtL0tidWlsZApAQCAtMSwyMyArMSw2IEBACiAjIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0CiBp bmNsdWRlIGluY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVpbGQuYXNtCiAKLWhlYWRlci15ICs9 IGF1eHZlYy5oCi1oZWFkZXIteSArPSBieXRlb3JkZXIuaAotaGVhZGVyLXkgKz0gZmNudGwuaAot aGVhZGVyLXkgKz0gaHdjYXAuaAotaGVhZGVyLXkgKz0gaW9jdGxzLmgKLWhlYWRlci15ICs9IGt2 bV9wYXJhLmgKLWhlYWRlci15ICs9IG1tYW4uaAotaGVhZGVyLXkgKz0gcGVyZl9yZWdzLmgKLWhl YWRlci15ICs9IHBvc2l4X3R5cGVzLmgKLWhlYWRlci15ICs9IHB0cmFjZS5oCi1oZWFkZXIteSAr PSBzZXR1cC5oCi1oZWFkZXIteSArPSBzaWdjb250ZXh0LmgKLWhlYWRlci15ICs9IHNpZ25hbC5o Ci1oZWFkZXIteSArPSBzdGF0LmgKLWhlYWRlci15ICs9IHN0YXRmcy5oCi1oZWFkZXIteSArPSBz d2FiLmgKLWhlYWRlci15ICs9IHVuaXN0ZC5oCiBnZW5oZHIteSArPSB1bmlzdGQtY29tbW9uLmgK IGdlbmhkci15ICs9IHVuaXN0ZC1vYWJpLmgKIGdlbmhkci15ICs9IHVuaXN0ZC1lYWJpLmgKZGlm ZiAtLWdpdCBhL2FyY2gvYXJtNjQvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgYi9hcmNoL2FybTY0 L2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCmluZGV4IDgyNWIwZmU1MWMyYi4uMTNhOTdhYTIyODVm IDEwMDY0NAotLS0gYS9hcmNoL2FybTY0L2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCisrKyBiL2Fy Y2gvYXJtNjQvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKQEAgLTIsMjEgKzIsMyBAQAogaW5jbHVk ZSBpbmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMvS2J1aWxkLmFzbQogCiBnZW5lcmljLXkgKz0ga3Zt X3BhcmEuaAotCi1oZWFkZXIteSArPSBhdXh2ZWMuaAotaGVhZGVyLXkgKz0gYml0c3Blcmxvbmcu aAotaGVhZGVyLXkgKz0gYnl0ZW9yZGVyLmgKLWhlYWRlci15ICs9IGZjbnRsLmgKLWhlYWRlci15 ICs9IGh3Y2FwLmgKLWhlYWRlci15ICs9IGt2bV9wYXJhLmgKLWhlYWRlci15ICs9IHBlcmZfcmVn cy5oCi1oZWFkZXIteSArPSBwYXJhbS5oCi1oZWFkZXIteSArPSBwdHJhY2UuaAotaGVhZGVyLXkg Kz0gc2V0dXAuaAotaGVhZGVyLXkgKz0gc2lnY29udGV4dC5oCi1oZWFkZXIteSArPSBzaWdpbmZv LmgKLWhlYWRlci15ICs9IHNpZ25hbC5oCi1oZWFkZXIteSArPSBzdGF0LmgKLWhlYWRlci15ICs9 IHN0YXRmcy5oCi1oZWFkZXIteSArPSB1Y29udGV4dC5oCi1oZWFkZXIteSArPSB1bmlzdGQuaApk aWZmIC0tZ2l0IGEvYXJjaC9hdnIzMi9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCBiL2FyY2gvYXZy MzIvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKaW5kZXggMDhkOGEzZDc2ZWE4Li42MTAzOTUwODMz NjQgMTAwNjQ0Ci0tLSBhL2FyY2gvYXZyMzIvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKKysrIGIv YXJjaC9hdnIzMi9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZApAQCAtMSwyNiArMSw2IEBACiAjIFVB UEkgSGVhZGVyIGV4cG9ydCBsaXN0CiBpbmNsdWRlIGluY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9L YnVpbGQuYXNtCiAKLWhlYWRlci15ICs9IGF1eHZlYy5oCi1oZWFkZXIteSArPSBieXRlb3JkZXIu aAotaGVhZGVyLXkgKz0gY2FjaGVjdGwuaAotaGVhZGVyLXkgKz0gbXNnYnVmLmgKLWhlYWRlci15 ICs9IHBhcmFtLmgKLWhlYWRlci15ICs9IHBvc2l4X3R5cGVzLmgKLWhlYWRlci15ICs9IHB0cmFj ZS5oCi1oZWFkZXIteSArPSBzZW1idWYuaAotaGVhZGVyLXkgKz0gc2V0dXAuaAotaGVhZGVyLXkg Kz0gc2htYnVmLmgKLWhlYWRlci15ICs9IHNpZ2NvbnRleHQuaAotaGVhZGVyLXkgKz0gc2lnbmFs LmgKLWhlYWRlci15ICs9IHNvY2tldC5oCi1oZWFkZXIteSArPSBzb2NraW9zLmgKLWhlYWRlci15 ICs9IHN0YXQuaAotaGVhZGVyLXkgKz0gc3dhYi5oCi1oZWFkZXIteSArPSB0ZXJtYml0cy5oCi1o ZWFkZXIteSArPSB0ZXJtaW9zLmgKLWhlYWRlci15ICs9IHR5cGVzLmgKLWhlYWRlci15ICs9IHVu aXN0ZC5oCiBnZW5lcmljLXkgKz0gYml0c3BlcmxvbmcuaAogZ2VuZXJpYy15ICs9IGVycm5vLmgK IGdlbmVyaWMteSArPSBmY250bC5oCmRpZmYgLS1naXQgYS9hcmNoL2JsYWNrZmluL2luY2x1ZGUv dWFwaS9hc20vS2J1aWxkIGIvYXJjaC9ibGFja2Zpbi9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZApp bmRleCAwYmQyOGY3N2FiYzMuLmIxNWJmNmJjMGU5NCAxMDA2NDQKLS0tIGEvYXJjaC9ibGFja2Zp bi9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAorKysgYi9hcmNoL2JsYWNrZmluL2luY2x1ZGUvdWFw aS9hc20vS2J1aWxkCkBAIC0xLDE5ICsxLDIgQEAKICMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QK IGluY2x1ZGUgaW5jbHVkZS91YXBpL2FzbS1nZW5lcmljL0tidWlsZC5hc20KLQotaGVhZGVyLXkg Kz0gYmZpbl9zcG9ydC5oCi1oZWFkZXIteSArPSBieXRlb3JkZXIuaAotaGVhZGVyLXkgKz0gY2Fj aGVjdGwuaAotaGVhZGVyLXkgKz0gZmNudGwuaAotaGVhZGVyLXkgKz0gZml4ZWRfY29kZS5oCi1o ZWFkZXIteSArPSBpb2N0bHMuaAotaGVhZGVyLXkgKz0ga3ZtX3BhcmEuaAotaGVhZGVyLXkgKz0g cG9sbC5oCi1oZWFkZXIteSArPSBwb3NpeF90eXBlcy5oCi1oZWFkZXIteSArPSBwdHJhY2UuaAot aGVhZGVyLXkgKz0gc2lnY29udGV4dC5oCi1oZWFkZXIteSArPSBzaWdpbmZvLmgKLWhlYWRlci15 ICs9IHNpZ25hbC5oCi1oZWFkZXIteSArPSBzdGF0LmgKLWhlYWRlci15ICs9IHN3YWIuaAotaGVh ZGVyLXkgKz0gdW5pc3RkLmgKZGlmZiAtLWdpdCBhL2FyY2gvYzZ4L2luY2x1ZGUvdWFwaS9hc20v S2J1aWxkIGIvYXJjaC9jNngvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKaW5kZXggZTliYzJiMmI4 MTQ3Li4xM2E5N2FhMjI4NWYgMTAwNjQ0Ci0tLSBhL2FyY2gvYzZ4L2luY2x1ZGUvdWFwaS9hc20v S2J1aWxkCisrKyBiL2FyY2gvYzZ4L2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCkBAIC0yLDExICsy LDMgQEAKIGluY2x1ZGUgaW5jbHVkZS91YXBpL2FzbS1nZW5lcmljL0tidWlsZC5hc20KIAogZ2Vu ZXJpYy15ICs9IGt2bV9wYXJhLmgKLQotaGVhZGVyLXkgKz0gYnl0ZW9yZGVyLmgKLWhlYWRlci15 ICs9IGt2bV9wYXJhLmgKLWhlYWRlci15ICs9IHB0cmFjZS5oCi1oZWFkZXIteSArPSBzZXR1cC5o Ci1oZWFkZXIteSArPSBzaWdjb250ZXh0LmgKLWhlYWRlci15ICs9IHN3YWIuaAotaGVhZGVyLXkg Kz0gdW5pc3RkLmgKZGlmZiAtLWdpdCBhL2FyY2gvY3Jpcy9pbmNsdWRlL3VhcGkvYXJjaC12MTAv YXJjaC9LYnVpbGQgYi9hcmNoL2NyaXMvaW5jbHVkZS91YXBpL2FyY2gtdjEwL2FyY2gvS2J1aWxk CmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA5MDQ4Yzg3YTc4MmIuLjAwMDAwMDAwMDAw MAotLS0gYS9hcmNoL2NyaXMvaW5jbHVkZS91YXBpL2FyY2gtdjEwL2FyY2gvS2J1aWxkCisrKyAv ZGV2L251bGwKQEAgLTEsNSArMCwwIEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFk ZXIteSArPSBzdl9hZGRyLmFnaAotaGVhZGVyLXkgKz0gc3ZfYWRkcl9hZy5oCi1oZWFkZXIteSAr PSBzdmludG8uaAotaGVhZGVyLXkgKz0gdXNlci5oCmRpZmYgLS1naXQgYS9hcmNoL2NyaXMvaW5j bHVkZS91YXBpL2FyY2gtdjMyL2FyY2gvS2J1aWxkIGIvYXJjaC9jcmlzL2luY2x1ZGUvdWFwaS9h cmNoLXYzMi9hcmNoL0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNTllZmZm ZDE2YjYxLi4wMDAwMDAwMDAwMDAKLS0tIGEvYXJjaC9jcmlzL2luY2x1ZGUvdWFwaS9hcmNoLXYz Mi9hcmNoL0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDMgKzAsMCBAQAotIyBVQVBJIEhlYWRl ciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gY3J5cHRvY29wLmgKLWhlYWRlci15ICs9IHVzZXIu aApkaWZmIC0tZ2l0IGEvYXJjaC9jcmlzL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkIGIvYXJjaC9j cmlzL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCmluZGV4IGQ1NTY0YTBhZTY2YS4uZDBjNTQ3MTg1 NmUwIDEwMDY0NAotLS0gYS9hcmNoL2NyaXMvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKKysrIGIv YXJjaC9jcmlzL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCkBAIC0xLDQ0ICsxLDUgQEAKICMgVUFQ SSBIZWFkZXIgZXhwb3J0IGxpc3QKIGluY2x1ZGUgaW5jbHVkZS91YXBpL2FzbS1nZW5lcmljL0ti dWlsZC5hc20KIAotaGVhZGVyLXkgKz0gLi4vYXJjaC12MTAvYXJjaC8KLWhlYWRlci15ICs9IC4u L2FyY2gtdjMyL2FyY2gvCi1oZWFkZXIteSArPSBhdXh2ZWMuaAotaGVhZGVyLXkgKz0gYml0c3Bl cmxvbmcuaAotaGVhZGVyLXkgKz0gYnl0ZW9yZGVyLmgKLWhlYWRlci15ICs9IGVsZi5oCi1oZWFk ZXIteSArPSBlbGZfdjEwLmgKLWhlYWRlci15ICs9IGVsZl92MzIuaAotaGVhZGVyLXkgKz0gZXJy bm8uaAotaGVhZGVyLXkgKz0gZXRoZXJuZXQuaAotaGVhZGVyLXkgKz0gZXRyYXhncGlvLmgKLWhl YWRlci15ICs9IGZjbnRsLmgKLWhlYWRlci15ICs9IGlvY3RsLmgKLWhlYWRlci15ICs9IGlvY3Rs cy5oCi1oZWFkZXIteSArPSBpcGNidWYuaAotaGVhZGVyLXkgKz0gbW1hbi5oCi1oZWFkZXIteSAr PSBtc2didWYuaAotaGVhZGVyLXkgKz0gcGFyYW0uaAotaGVhZGVyLXkgKz0gcG9sbC5oCi1oZWFk ZXIteSArPSBwb3NpeF90eXBlcy5oCi1oZWFkZXIteSArPSBwdHJhY2UuaAotaGVhZGVyLXkgKz0g cHRyYWNlX3YxMC5oCi1oZWFkZXIteSArPSBwdHJhY2VfdjMyLmgKLWhlYWRlci15ICs9IHJlc291 cmNlLmgKLWhlYWRlci15ICs9IHJzNDg1LmgKLWhlYWRlci15ICs9IHNlbWJ1Zi5oCi1oZWFkZXIt eSArPSBzZXR1cC5oCi1oZWFkZXIteSArPSBzaG1idWYuaAotaGVhZGVyLXkgKz0gc2lnY29udGV4 dC5oCi1oZWFkZXIteSArPSBzaWdpbmZvLmgKLWhlYWRlci15ICs9IHNpZ25hbC5oCi1oZWFkZXIt eSArPSBzb2NrZXQuaAotaGVhZGVyLXkgKz0gc29ja2lvcy5oCi1oZWFkZXIteSArPSBzdGF0LmgK LWhlYWRlci15ICs9IHN0YXRmcy5oCi1oZWFkZXIteSArPSBzd2FiLmgKLWhlYWRlci15ICs9IHN5 bmNfc2VyaWFsLmgKLWhlYWRlci15ICs9IHRlcm1iaXRzLmgKLWhlYWRlci15ICs9IHRlcm1pb3Mu aAotaGVhZGVyLXkgKz0gdHlwZXMuaAotaGVhZGVyLXkgKz0gdW5pc3RkLmgKK3N1YmRpci15ICs9 IC4uL2FyY2gtdjEwL2FyY2gvCitzdWJkaXIteSArPSAuLi9hcmNoLXYzMi9hcmNoLwpkaWZmIC0t Z2l0IGEvYXJjaC9mcnYvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgYi9hcmNoL2Zydi9pbmNsdWRl L3VhcGkvYXNtL0tidWlsZAppbmRleCA0MmEyYjMzNDYxYzAuLmIxNWJmNmJjMGU5NCAxMDA2NDQK LS0tIGEvYXJjaC9mcnYvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKKysrIGIvYXJjaC9mcnYvaW5j bHVkZS91YXBpL2FzbS9LYnVpbGQKQEAgLTEsMzUgKzEsMiBAQAogIyBVQVBJIEhlYWRlciBleHBv cnQgbGlzdAogaW5jbHVkZSBpbmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMvS2J1aWxkLmFzbQotCi1o ZWFkZXIteSArPSBhdXh2ZWMuaAotaGVhZGVyLXkgKz0gYml0c3BlcmxvbmcuaAotaGVhZGVyLXkg Kz0gYnl0ZW9yZGVyLmgKLWhlYWRlci15ICs9IGVycm5vLmgKLWhlYWRlci15ICs9IGZjbnRsLmgK LWhlYWRlci15ICs9IGlvY3RsLmgKLWhlYWRlci15ICs9IGlvY3Rscy5oCi1oZWFkZXIteSArPSBp cGNidWYuaAotaGVhZGVyLXkgKz0ga3ZtX3BhcmEuaAotaGVhZGVyLXkgKz0gbW1hbi5oCi1oZWFk ZXIteSArPSBtc2didWYuaAotaGVhZGVyLXkgKz0gcGFyYW0uaAotaGVhZGVyLXkgKz0gcG9sbC5o Ci1oZWFkZXIteSArPSBwb3NpeF90eXBlcy5oCi1oZWFkZXIteSArPSBwdHJhY2UuaAotaGVhZGVy LXkgKz0gcmVnaXN0ZXJzLmgKLWhlYWRlci15ICs9IHJlc291cmNlLmgKLWhlYWRlci15ICs9IHNl bWJ1Zi5oCi1oZWFkZXIteSArPSBzZXR1cC5oCi1oZWFkZXIteSArPSBzaG1idWYuaAotaGVhZGVy LXkgKz0gc2lnY29udGV4dC5oCi1oZWFkZXIteSArPSBzaWdpbmZvLmgKLWhlYWRlci15ICs9IHNp Z25hbC5oCi1oZWFkZXIteSArPSBzb2NrZXQuaAotaGVhZGVyLXkgKz0gc29ja2lvcy5oCi1oZWFk ZXIteSArPSBzdGF0LmgKLWhlYWRlci15ICs9IHN0YXRmcy5oCi1oZWFkZXIteSArPSBzd2FiLmgK LWhlYWRlci15ICs9IHRlcm1iaXRzLmgKLWhlYWRlci15ICs9IHRlcm1pb3MuaAotaGVhZGVyLXkg Kz0gdHlwZXMuaAotaGVhZGVyLXkgKz0gdW5pc3RkLmgKZGlmZiAtLWdpdCBhL2FyY2gvaDgzMDAv aW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgYi9hcmNoL2g4MzAwL2luY2x1ZGUvdWFwaS9hc20vS2J1 aWxkCmluZGV4IGZiNjEwMWE1ZDRmMS4uYjE1YmY2YmMwZTk0IDEwMDY0NAotLS0gYS9hcmNoL2g4 MzAwL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCisrKyBiL2FyY2gvaDgzMDAvaW5jbHVkZS91YXBp L2FzbS9LYnVpbGQKQEAgLTEsMzAgKzEsMiBAQAogIyBVQVBJIEhlYWRlciBleHBvcnQgbGlzdAog aW5jbHVkZSBpbmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMvS2J1aWxkLmFzbQotCi1oZWFkZXIteSAr PSBhdXh2ZWMuaAotaGVhZGVyLXkgKz0gYml0c3BlcmxvbmcuaAotaGVhZGVyLXkgKz0gZXJybm8u aAotaGVhZGVyLXkgKz0gZmNudGwuaAotaGVhZGVyLXkgKz0gaW9jdGwuaAotaGVhZGVyLXkgKz0g aW9jdGxzLmgKLWhlYWRlci15ICs9IGlwY2J1Zi5oCi1oZWFkZXIteSArPSBrdm1fcGFyYS5oCi1o ZWFkZXIteSArPSBtbWFuLmgKLWhlYWRlci15ICs9IG1zZ2J1Zi5oCi1oZWFkZXIteSArPSBwYXJh bS5oCi1oZWFkZXIteSArPSBwb2xsLmgKLWhlYWRlci15ICs9IHBvc2l4X3R5cGVzLmgKLWhlYWRl ci15ICs9IHJlc291cmNlLmgKLWhlYWRlci15ICs9IHNlbWJ1Zi5oCi1oZWFkZXIteSArPSBzZXR1 cC5oCi1oZWFkZXIteSArPSBzaG1idWYuaAotaGVhZGVyLXkgKz0gc2lnaW5mby5oCi1oZWFkZXIt eSArPSBzb2NrZXQuaAotaGVhZGVyLXkgKz0gc29ja2lvcy5oCi1oZWFkZXIteSArPSBzdGF0LmgK LWhlYWRlci15ICs9IHN0YXRmcy5oCi1oZWFkZXIteSArPSBzd2FiLmgKLWhlYWRlci15ICs9IHRl cm1iaXRzLmgKLWhlYWRlci15ICs9IHRlcm1pb3MuaAotaGVhZGVyLXkgKz0gdHlwZXMuaAotaGVh ZGVyLXkgKz0gdW5pc3RkLmgKZGlmZiAtLWdpdCBhL2FyY2gvaGV4YWdvbi9pbmNsdWRlL2FzbS9L YnVpbGQgYi9hcmNoL2hleGFnb24vaW5jbHVkZS9hc20vS2J1aWxkCmluZGV4IGRiOGRkYWJjNmJk Mi4uZjNiMWNlYjVjMWU0IDEwMDY0NAotLS0gYS9hcmNoL2hleGFnb24vaW5jbHVkZS9hc20vS2J1 aWxkCisrKyBiL2FyY2gvaGV4YWdvbi9pbmNsdWRlL2FzbS9LYnVpbGQKQEAgLTEsNiArMSwzIEBA Ci0KLWhlYWRlci15ICs9IHVjb250ZXh0LmgKLQogZ2VuZXJpYy15ICs9IGF1eHZlYy5oCiBnZW5l cmljLXkgKz0gYmFycmllci5oCiBnZW5lcmljLXkgKz0gYnVnLmgKZGlmZiAtLWdpdCBhL2FyY2gv aGV4YWdvbi9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCBiL2FyY2gvaGV4YWdvbi9pbmNsdWRlL3Vh cGkvYXNtL0tidWlsZAppbmRleCBjMzE3MDZjMzg2MzEuLmIxNWJmNmJjMGU5NCAxMDA2NDQKLS0t IGEvYXJjaC9oZXhhZ29uL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCisrKyBiL2FyY2gvaGV4YWdv bi9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZApAQCAtMSwxNSArMSwyIEBACiAjIFVBUEkgSGVhZGVy IGV4cG9ydCBsaXN0CiBpbmNsdWRlIGluY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVpbGQuYXNt Ci0KLWhlYWRlci15ICs9IGJpdHNwZXJsb25nLmgKLWhlYWRlci15ICs9IGJ5dGVvcmRlci5oCi1o ZWFkZXIteSArPSBrdm1fcGFyYS5oCi1oZWFkZXIteSArPSBwYXJhbS5oCi1oZWFkZXIteSArPSBw dHJhY2UuaAotaGVhZGVyLXkgKz0gcmVnaXN0ZXJzLmgKLWhlYWRlci15ICs9IHNldHVwLmgKLWhl YWRlci15ICs9IHNpZ2NvbnRleHQuaAotaGVhZGVyLXkgKz0gc2lnbmFsLmgKLWhlYWRlci15ICs9 IHN3YWIuaAotaGVhZGVyLXkgKz0gdW5pc3RkLmgKLWhlYWRlci15ICs9IHVzZXIuaApkaWZmIC0t Z2l0IGEvYXJjaC9pYTY0L2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkIGIvYXJjaC9pYTY0L2luY2x1 ZGUvdWFwaS9hc20vS2J1aWxkCmluZGV4IDg5MTAwMmJiYjk5NS4uMTNhOTdhYTIyODVmIDEwMDY0 NAotLS0gYS9hcmNoL2lhNjQvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKKysrIGIvYXJjaC9pYTY0 L2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCkBAIC0yLDQ4ICsyLDMgQEAKIGluY2x1ZGUgaW5jbHVk ZS91YXBpL2FzbS1nZW5lcmljL0tidWlsZC5hc20KIAogZ2VuZXJpYy15ICs9IGt2bV9wYXJhLmgK LQotaGVhZGVyLXkgKz0gYXV4dmVjLmgKLWhlYWRlci15ICs9IGJpdHNwZXJsb25nLmgKLWhlYWRl ci15ICs9IGJyZWFrLmgKLWhlYWRlci15ICs9IGJ5dGVvcmRlci5oCi1oZWFkZXIteSArPSBjbXB4 Y2hnLmgKLWhlYWRlci15ICs9IGVycm5vLmgKLWhlYWRlci15ICs9IGZjbnRsLmgKLWhlYWRlci15 ICs9IGZwdS5oCi1oZWFkZXIteSArPSBnY2NfaW50cmluLmgKLWhlYWRlci15ICs9IGlhNjRyZWdz LmgKLWhlYWRlci15ICs9IGludGVsX2ludHJpbi5oCi1oZWFkZXIteSArPSBpbnRyaW5zaWNzLmgK LWhlYWRlci15ICs9IGlvY3RsLmgKLWhlYWRlci15ICs9IGlvY3Rscy5oCi1oZWFkZXIteSArPSBp cGNidWYuaAotaGVhZGVyLXkgKz0ga3ZtX3BhcmEuaAotaGVhZGVyLXkgKz0gbW1hbi5oCi1oZWFk ZXIteSArPSBtc2didWYuaAotaGVhZGVyLXkgKz0gcGFyYW0uaAotaGVhZGVyLXkgKz0gcGVyZm1v bi5oCi1oZWFkZXIteSArPSBwZXJmbW9uX2RlZmF1bHRfc21wbC5oCi1oZWFkZXIteSArPSBwb2xs LmgKLWhlYWRlci15ICs9IHBvc2l4X3R5cGVzLmgKLWhlYWRlci15ICs9IHB0cmFjZS5oCi1oZWFk ZXIteSArPSBwdHJhY2Vfb2Zmc2V0cy5oCi1oZWFkZXIteSArPSByZXNvdXJjZS5oCi1oZWFkZXIt eSArPSByc2UuaAotaGVhZGVyLXkgKz0gc2VtYnVmLmgKLWhlYWRlci15ICs9IHNldHVwLmgKLWhl YWRlci15ICs9IHNobWJ1Zi5oCi1oZWFkZXIteSArPSBzaWdjb250ZXh0LmgKLWhlYWRlci15ICs9 IHNpZ2luZm8uaAotaGVhZGVyLXkgKz0gc2lnbmFsLmgKLWhlYWRlci15ICs9IHNvY2tldC5oCi1o ZWFkZXIteSArPSBzb2NraW9zLmgKLWhlYWRlci15ICs9IHN0YXQuaAotaGVhZGVyLXkgKz0gc3Rh dGZzLmgKLWhlYWRlci15ICs9IHN3YWIuaAotaGVhZGVyLXkgKz0gdGVybWJpdHMuaAotaGVhZGVy LXkgKz0gdGVybWlvcy5oCi1oZWFkZXIteSArPSB0eXBlcy5oCi1oZWFkZXIteSArPSB1Y29udGV4 dC5oCi1oZWFkZXIteSArPSB1bmlzdGQuaAotaGVhZGVyLXkgKz0gdXN0YWNrLmgKZGlmZiAtLWdp dCBhL2FyY2gvbTMyci9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCBiL2FyY2gvbTMyci9pbmNsdWRl L3VhcGkvYXNtL0tidWlsZAppbmRleCA0MzkzN2E2MWQ2Y2YuLmIxNWJmNmJjMGU5NCAxMDA2NDQK LS0tIGEvYXJjaC9tMzJyL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCisrKyBiL2FyY2gvbTMyci9p bmNsdWRlL3VhcGkvYXNtL0tidWlsZApAQCAtMSwzMyArMSwyIEBACiAjIFVBUEkgSGVhZGVyIGV4 cG9ydCBsaXN0CiBpbmNsdWRlIGluY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVpbGQuYXNtCi0K LWhlYWRlci15ICs9IGF1eHZlYy5oCi1oZWFkZXIteSArPSBiaXRzcGVybG9uZy5oCi1oZWFkZXIt eSArPSBieXRlb3JkZXIuaAotaGVhZGVyLXkgKz0gZXJybm8uaAotaGVhZGVyLXkgKz0gZmNudGwu aAotaGVhZGVyLXkgKz0gaW9jdGwuaAotaGVhZGVyLXkgKz0gaW9jdGxzLmgKLWhlYWRlci15ICs9 IGlwY2J1Zi5oCi1oZWFkZXIteSArPSBtbWFuLmgKLWhlYWRlci15ICs9IG1zZ2J1Zi5oCi1oZWFk ZXIteSArPSBwYXJhbS5oCi1oZWFkZXIteSArPSBwb2xsLmgKLWhlYWRlci15ICs9IHBvc2l4X3R5 cGVzLmgKLWhlYWRlci15ICs9IHB0cmFjZS5oCi1oZWFkZXIteSArPSByZXNvdXJjZS5oCi1oZWFk ZXIteSArPSBzZW1idWYuaAotaGVhZGVyLXkgKz0gc2V0dXAuaAotaGVhZGVyLXkgKz0gc2htYnVm LmgKLWhlYWRlci15ICs9IHNpZ2NvbnRleHQuaAotaGVhZGVyLXkgKz0gc2lnaW5mby5oCi1oZWFk ZXIteSArPSBzaWduYWwuaAotaGVhZGVyLXkgKz0gc29ja2V0LmgKLWhlYWRlci15ICs9IHNvY2tp b3MuaAotaGVhZGVyLXkgKz0gc3RhdC5oCi1oZWFkZXIteSArPSBzdGF0ZnMuaAotaGVhZGVyLXkg Kz0gc3dhYi5oCi1oZWFkZXIteSArPSB0ZXJtYml0cy5oCi1oZWFkZXIteSArPSB0ZXJtaW9zLmgK LWhlYWRlci15ICs9IHR5cGVzLmgKLWhlYWRlci15ICs9IHVuaXN0ZC5oCmRpZmYgLS1naXQgYS9h cmNoL202OGsvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgYi9hcmNoL202OGsvaW5jbHVkZS91YXBp L2FzbS9LYnVpbGQKaW5kZXggNmEyZDI1N2JkZmIyLi42NDM2ODA3NzIzNWEgMTAwNjQ0Ci0tLSBh L2FyY2gvbTY4ay9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAorKysgYi9hcmNoL202OGsvaW5jbHVk ZS91YXBpL2FzbS9LYnVpbGQKQEAgLTksMjcgKzksMyBAQCBnZW5lcmljLXkgKz0gc29ja2V0LmgK IGdlbmVyaWMteSArPSBzb2NraW9zLmgKIGdlbmVyaWMteSArPSB0ZXJtYml0cy5oCiBnZW5lcmlj LXkgKz0gdGVybWlvcy5oCi0KLWhlYWRlci15ICs9IGEub3V0LmgKLWhlYWRlci15ICs9IGJvb3Rp bmZvLmgKLWhlYWRlci15ICs9IGJvb3RpbmZvLWFtaWdhLmgKLWhlYWRlci15ICs9IGJvb3RpbmZv LWFwb2xsby5oCi1oZWFkZXIteSArPSBib290aW5mby1hdGFyaS5oCi1oZWFkZXIteSArPSBib290 aW5mby1ocDMwMC5oCi1oZWFkZXIteSArPSBib290aW5mby1tYWMuaAotaGVhZGVyLXkgKz0gYm9v dGluZm8tcTQwLmgKLWhlYWRlci15ICs9IGJvb3RpbmZvLXZtZS5oCi1oZWFkZXIteSArPSBieXRl b3JkZXIuaAotaGVhZGVyLXkgKz0gY2FjaGVjdGwuaAotaGVhZGVyLXkgKz0gZmNudGwuaAotaGVh ZGVyLXkgKz0gaW9jdGxzLmgKLWhlYWRlci15ICs9IHBhcmFtLmgKLWhlYWRlci15ICs9IHBvbGwu aAotaGVhZGVyLXkgKz0gcG9zaXhfdHlwZXMuaAotaGVhZGVyLXkgKz0gcHRyYWNlLmgKLWhlYWRl ci15ICs9IHNldHVwLmgKLWhlYWRlci15ICs9IHNpZ2NvbnRleHQuaAotaGVhZGVyLXkgKz0gc2ln bmFsLmgKLWhlYWRlci15ICs9IHN0YXQuaAotaGVhZGVyLXkgKz0gc3dhYi5oCi1oZWFkZXIteSAr PSB1bmlzdGQuaApkaWZmIC0tZ2l0IGEvYXJjaC9tZXRhZy9pbmNsdWRlL3VhcGkvYXNtL0tidWls ZCBiL2FyY2gvbWV0YWcvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKaW5kZXggYWI3OGJlMmI2ZWIw Li5iMjk3MzFlYmQ3YTkgMTAwNjQ0Ci0tLSBhL2FyY2gvbWV0YWcvaW5jbHVkZS91YXBpL2FzbS9L YnVpbGQKKysrIGIvYXJjaC9tZXRhZy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZApAQCAtMSwxNCAr MSw2IEBACiAjIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0CiBpbmNsdWRlIGluY2x1ZGUvdWFwaS9h c20tZ2VuZXJpYy9LYnVpbGQuYXNtCiAKLWhlYWRlci15ICs9IGJ5dGVvcmRlci5oCi1oZWFkZXIt eSArPSBlY2guaAotaGVhZGVyLXkgKz0gcHRyYWNlLmgKLWhlYWRlci15ICs9IHNpZ2NvbnRleHQu aAotaGVhZGVyLXkgKz0gc2lnaW5mby5oCi1oZWFkZXIteSArPSBzd2FiLmgKLWhlYWRlci15ICs9 IHVuaXN0ZC5oCi0KIGdlbmVyaWMteSArPSBtbWFuLmgKIGdlbmVyaWMteSArPSByZXNvdXJjZS5o CiBnZW5lcmljLXkgKz0gc2V0dXAuaApkaWZmIC0tZ2l0IGEvYXJjaC9taWNyb2JsYXplL2luY2x1 ZGUvdWFwaS9hc20vS2J1aWxkIGIvYXJjaC9taWNyb2JsYXplL2luY2x1ZGUvdWFwaS9hc20vS2J1 aWxkCmluZGV4IDFhYWM5OWY4N2RmMS4uMjE3OGM3OGM3YzFhIDEwMDY0NAotLS0gYS9hcmNoL21p Y3JvYmxhemUvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKKysrIGIvYXJjaC9taWNyb2JsYXplL2lu Y2x1ZGUvdWFwaS9hc20vS2J1aWxkCkBAIC0yLDM1ICsyLDMgQEAKIGluY2x1ZGUgaW5jbHVkZS91 YXBpL2FzbS1nZW5lcmljL0tidWlsZC5hc20KIAogZ2VuZXJpYy15ICs9IHR5cGVzLmgKLQotaGVh ZGVyLXkgKz0gYXV4dmVjLmgKLWhlYWRlci15ICs9IGJpdHNwZXJsb25nLmgKLWhlYWRlci15ICs9 IGJ5dGVvcmRlci5oCi1oZWFkZXIteSArPSBlbGYuaAotaGVhZGVyLXkgKz0gZXJybm8uaAotaGVh ZGVyLXkgKz0gZmNudGwuaAotaGVhZGVyLXkgKz0gaW9jdGwuaAotaGVhZGVyLXkgKz0gaW9jdGxz LmgKLWhlYWRlci15ICs9IGlwY2J1Zi5oCi1oZWFkZXIteSArPSBrdm1fcGFyYS5oCi1oZWFkZXIt eSArPSBtbWFuLmgKLWhlYWRlci15ICs9IG1zZ2J1Zi5oCi1oZWFkZXIteSArPSBwYXJhbS5oCi1o ZWFkZXIteSArPSBwb2xsLmgKLWhlYWRlci15ICs9IHBvc2l4X3R5cGVzLmgKLWhlYWRlci15ICs9 IHB0cmFjZS5oCi1oZWFkZXIteSArPSByZXNvdXJjZS5oCi1oZWFkZXIteSArPSBzZW1idWYuaAot aGVhZGVyLXkgKz0gc2V0dXAuaAotaGVhZGVyLXkgKz0gc2htYnVmLmgKLWhlYWRlci15ICs9IHNp Z2NvbnRleHQuaAotaGVhZGVyLXkgKz0gc2lnaW5mby5oCi1oZWFkZXIteSArPSBzaWduYWwuaAot aGVhZGVyLXkgKz0gc29ja2V0LmgKLWhlYWRlci15ICs9IHNvY2tpb3MuaAotaGVhZGVyLXkgKz0g c3RhdC5oCi1oZWFkZXIteSArPSBzdGF0ZnMuaAotaGVhZGVyLXkgKz0gc3dhYi5oCi1oZWFkZXIt eSArPSB0ZXJtYml0cy5oCi1oZWFkZXIteSArPSB0ZXJtaW9zLmgKLWhlYWRlci15ICs9IHVuaXN0 ZC5oCmRpZmYgLS1naXQgYS9hcmNoL21pcHMvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgYi9hcmNo L21pcHMvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKaW5kZXggZjJjZjQxNDYxMTQ2Li5hMDI2NmZl YmE5ZTYgMTAwNjQ0Ci0tLSBhL2FyY2gvbWlwcy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAorKysg Yi9hcmNoL21pcHMvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKQEAgLTIsNDAgKzIsMyBAQAogaW5j bHVkZSBpbmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMvS2J1aWxkLmFzbQogCiBnZW5lcmljLXkgKz0g aXBjYnVmLmgKLQotaGVhZGVyLXkgKz0gYXV4dmVjLmgKLWhlYWRlci15ICs9IGJpdGZpZWxkLmgK LWhlYWRlci15ICs9IGJpdHNwZXJsb25nLmgKLWhlYWRlci15ICs9IGJyZWFrLmgKLWhlYWRlci15 ICs9IGJ5dGVvcmRlci5oCi1oZWFkZXIteSArPSBjYWNoZWN0bC5oCi1oZWFkZXIteSArPSBlcnJu by5oCi1oZWFkZXIteSArPSBmY250bC5oCi1oZWFkZXIteSArPSBpbnN0LmgKLWhlYWRlci15ICs9 IGlvY3RsLmgKLWhlYWRlci15ICs9IGlvY3Rscy5oCi1oZWFkZXIteSArPSBrdm1fcGFyYS5oCi1o ZWFkZXIteSArPSBtbWFuLmgKLWhlYWRlci15ICs9IG1zZ2J1Zi5oCi1oZWFkZXIteSArPSBwYXJh bS5oCi1oZWFkZXIteSArPSBwb2xsLmgKLWhlYWRlci15ICs9IHBvc2l4X3R5cGVzLmgKLWhlYWRl ci15ICs9IHB0cmFjZS5oCi1oZWFkZXIteSArPSByZXNvdXJjZS5oCi1oZWFkZXIteSArPSBzZW1i dWYuaAotaGVhZGVyLXkgKz0gc2V0dXAuaAotaGVhZGVyLXkgKz0gc2dpZGVmcy5oCi1oZWFkZXIt eSArPSBzaG1idWYuaAotaGVhZGVyLXkgKz0gc2lnY29udGV4dC5oCi1oZWFkZXIteSArPSBzaWdp bmZvLmgKLWhlYWRlci15ICs9IHNpZ25hbC5oCi1oZWFkZXIteSArPSBzb2NrZXQuaAotaGVhZGVy LXkgKz0gc29ja2lvcy5oCi1oZWFkZXIteSArPSBzdGF0LmgKLWhlYWRlci15ICs9IHN0YXRmcy5o Ci1oZWFkZXIteSArPSBzd2FiLmgKLWhlYWRlci15ICs9IHN5c21pcHMuaAotaGVhZGVyLXkgKz0g dGVybWJpdHMuaAotaGVhZGVyLXkgKz0gdGVybWlvcy5oCi1oZWFkZXIteSArPSB0eXBlcy5oCi1o ZWFkZXIteSArPSB1bmlzdGQuaApkaWZmIC0tZ2l0IGEvYXJjaC9tbjEwMzAwL2luY2x1ZGUvdWFw aS9hc20vS2J1aWxkIGIvYXJjaC9tbjEwMzAwL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCmluZGV4 IDA0MDE3OGNkYjNlYi4uYjE1YmY2YmMwZTk0IDEwMDY0NAotLS0gYS9hcmNoL21uMTAzMDAvaW5j bHVkZS91YXBpL2FzbS9LYnVpbGQKKysrIGIvYXJjaC9tbjEwMzAwL2luY2x1ZGUvdWFwaS9hc20v S2J1aWxkCkBAIC0xLDM0ICsxLDIgQEAKICMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKIGluY2x1 ZGUgaW5jbHVkZS91YXBpL2FzbS1nZW5lcmljL0tidWlsZC5hc20KLQotaGVhZGVyLXkgKz0gYXV4 dmVjLmgKLWhlYWRlci15ICs9IGJpdHNwZXJsb25nLmgKLWhlYWRlci15ICs9IGJ5dGVvcmRlci5o Ci1oZWFkZXIteSArPSBlcnJuby5oCi1oZWFkZXIteSArPSBmY250bC5oCi1oZWFkZXIteSArPSBp b2N0bC5oCi1oZWFkZXIteSArPSBpb2N0bHMuaAotaGVhZGVyLXkgKz0gaXBjYnVmLmgKLWhlYWRl ci15ICs9IGt2bV9wYXJhLmgKLWhlYWRlci15ICs9IG1tYW4uaAotaGVhZGVyLXkgKz0gbXNnYnVm LmgKLWhlYWRlci15ICs9IHBhcmFtLmgKLWhlYWRlci15ICs9IHBvbGwuaAotaGVhZGVyLXkgKz0g cG9zaXhfdHlwZXMuaAotaGVhZGVyLXkgKz0gcHRyYWNlLmgKLWhlYWRlci15ICs9IHJlc291cmNl LmgKLWhlYWRlci15ICs9IHNlbWJ1Zi5oCi1oZWFkZXIteSArPSBzZXR1cC5oCi1oZWFkZXIteSAr PSBzaG1idWYuaAotaGVhZGVyLXkgKz0gc2lnY29udGV4dC5oCi1oZWFkZXIteSArPSBzaWdpbmZv LmgKLWhlYWRlci15ICs9IHNpZ25hbC5oCi1oZWFkZXIteSArPSBzb2NrZXQuaAotaGVhZGVyLXkg Kz0gc29ja2lvcy5oCi1oZWFkZXIteSArPSBzdGF0LmgKLWhlYWRlci15ICs9IHN0YXRmcy5oCi1o ZWFkZXIteSArPSBzd2FiLmgKLWhlYWRlci15ICs9IHRlcm1iaXRzLmgKLWhlYWRlci15ICs9IHRl cm1pb3MuaAotaGVhZGVyLXkgKz0gdHlwZXMuaAotaGVhZGVyLXkgKz0gdW5pc3RkLmgKZGlmZiAt LWdpdCBhL2FyY2gvbmlvczIvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgYi9hcmNoL25pb3MyL2lu Y2x1ZGUvdWFwaS9hc20vS2J1aWxkCmluZGV4IDY5Yzk2NTMwNDE0Ni4uMzc0YmQxMjMzMjlmIDEw MDY0NAotLS0gYS9hcmNoL25pb3MyL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCisrKyBiL2FyY2gv bmlvczIvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKQEAgLTEsNiArMSw1IEBACisjIFVBUEkgSGVh ZGVyIGV4cG9ydCBsaXN0CiBpbmNsdWRlIGluY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVpbGQu YXNtCiAKLWhlYWRlci15ICs9IGVsZi5oCi0KIGdlbmVyaWMteSArPSBzZXR1cC5oCiBnZW5lcmlj LXkgKz0gdWNvbnRleHQuaApkaWZmIC0tZ2l0IGEvYXJjaC9vcGVucmlzYy9pbmNsdWRlL2FzbS9L YnVpbGQgYi9hcmNoL29wZW5yaXNjL2luY2x1ZGUvYXNtL0tidWlsZAppbmRleCAyODMyZjAzMWZi MTEuLjU2MTkxNTcxNmZkOSAxMDA2NDQKLS0tIGEvYXJjaC9vcGVucmlzYy9pbmNsdWRlL2FzbS9L YnVpbGQKKysrIGIvYXJjaC9vcGVucmlzYy9pbmNsdWRlL2FzbS9LYnVpbGQKQEAgLTEsNiArMSwz IEBACi0KLWhlYWRlci15ICs9IHVjb250ZXh0LmgKLQogZ2VuZXJpYy15ICs9IGF0b21pYy5oCiBn ZW5lcmljLXkgKz0gYXV4dmVjLmgKIGdlbmVyaWMteSArPSBiYXJyaWVyLmgKZGlmZiAtLWdpdCBh L2FyY2gvb3BlbnJpc2MvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQgYi9hcmNoL29wZW5yaXNjL2lu Y2x1ZGUvdWFwaS9hc20vS2J1aWxkCmluZGV4IDgwNzYxZWI4MmI1Zi4uYjE1YmY2YmMwZTk0IDEw MDY0NAotLS0gYS9hcmNoL29wZW5yaXNjL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCisrKyBiL2Fy Y2gvb3BlbnJpc2MvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKQEAgLTEsMTAgKzEsMiBAQAogIyBV QVBJIEhlYWRlciBleHBvcnQgbGlzdAogaW5jbHVkZSBpbmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMv S2J1aWxkLmFzbQotCi1oZWFkZXIteSArPSBieXRlb3JkZXIuaAotaGVhZGVyLXkgKz0gZWxmLmgK LWhlYWRlci15ICs9IGt2bV9wYXJhLmgKLWhlYWRlci15ICs9IHBhcmFtLmgKLWhlYWRlci15ICs9 IHB0cmFjZS5oCi1oZWFkZXIteSArPSBzaWdjb250ZXh0LmgKLWhlYWRlci15ICs9IHVuaXN0ZC5o CmRpZmYgLS1naXQgYS9hcmNoL3BhcmlzYy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCBiL2FyY2gv cGFyaXNjL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCmluZGV4IDM0ODM1NmM5OTUxNC4uMzk3MWM2 MGE3ZTdmIDEwMDY0NAotLS0gYS9hcmNoL3BhcmlzYy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAor KysgYi9hcmNoL3BhcmlzYy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZApAQCAtMiwzMSArMiwzIEBA CiBpbmNsdWRlIGluY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVpbGQuYXNtCiAKIGdlbmVyaWMt eSArPSByZXNvdXJjZS5oCi0KLWhlYWRlci15ICs9IGJpdHNwZXJsb25nLmgKLWhlYWRlci15ICs9 IGJ5dGVvcmRlci5oCi1oZWFkZXIteSArPSBlcnJuby5oCi1oZWFkZXIteSArPSBmY250bC5oCi1o ZWFkZXIteSArPSBpb2N0bC5oCi1oZWFkZXIteSArPSBpb2N0bHMuaAotaGVhZGVyLXkgKz0gaXBj YnVmLmgKLWhlYWRlci15ICs9IG1tYW4uaAotaGVhZGVyLXkgKz0gbXNnYnVmLmgKLWhlYWRlci15 ICs9IHBkYy5oCi1oZWFkZXIteSArPSBwb3NpeF90eXBlcy5oCi1oZWFkZXIteSArPSBwdHJhY2Uu aAotaGVhZGVyLXkgKz0gc2VtYnVmLmgKLWhlYWRlci15ICs9IHNldHVwLmgKLWhlYWRlci15ICs9 IHNobWJ1Zi5oCi1oZWFkZXIteSArPSBzaWdjb250ZXh0LmgKLWhlYWRlci15ICs9IHNpZ2luZm8u aAotaGVhZGVyLXkgKz0gc2lnbmFsLmgKLWhlYWRlci15ICs9IHNvY2tldC5oCi1oZWFkZXIteSAr PSBzb2NraW9zLmgKLWhlYWRlci15ICs9IHN0YXQuaAotaGVhZGVyLXkgKz0gc3RhdGZzLmgKLWhl YWRlci15ICs9IHN3YWIuaAotaGVhZGVyLXkgKz0gdGVybWJpdHMuaAotaGVhZGVyLXkgKz0gdGVy bWlvcy5oCi1oZWFkZXIteSArPSB0eXBlcy5oCi1oZWFkZXIteSArPSB1bmlzdGQuaApkaWZmIC0t Z2l0IGEvYXJjaC9wb3dlcnBjL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkIGIvYXJjaC9wb3dlcnBj L2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCmluZGV4IGRhYjM3MTdlM2VhMC4uYjE1YmY2YmMwZTk0 IDEwMDY0NAotLS0gYS9hcmNoL3Bvd2VycGMvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKKysrIGIv YXJjaC9wb3dlcnBjL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCkBAIC0xLDQ3ICsxLDIgQEAKICMg VUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKIGluY2x1ZGUgaW5jbHVkZS91YXBpL2FzbS1nZW5lcmlj L0tidWlsZC5hc20KLQotaGVhZGVyLXkgKz0gYXV4dmVjLmgKLWhlYWRlci15ICs9IGJpdHNwZXJs b25nLmgKLWhlYWRlci15ICs9IGJvb3R4LmgKLWhlYWRlci15ICs9IGJ5dGVvcmRlci5oCi1oZWFk ZXIteSArPSBjcHV0YWJsZS5oCi1oZWFkZXIteSArPSBlZWguaAotaGVhZGVyLXkgKz0gZWxmLmgK LWhlYWRlci15ICs9IGVwYXByX2hjYWxscy5oCi1oZWFkZXIteSArPSBlcnJuby5oCi1oZWFkZXIt eSArPSBmY250bC5oCi1oZWFkZXIteSArPSBpb2N0bC5oCi1oZWFkZXIteSArPSBpb2N0bHMuaAot aGVhZGVyLXkgKz0gaXBjYnVmLmgKLWhlYWRlci15ICs9IGt2bS5oCi1oZWFkZXIteSArPSBrdm1f cGFyYS5oCi1oZWFkZXIteSArPSBtbWFuLmgKLWhlYWRlci15ICs9IG1zZ2J1Zi5oCi1oZWFkZXIt eSArPSBudnJhbS5oCi1oZWFkZXIteSArPSBvcGFsLXByZC5oCi1oZWFkZXIteSArPSBwYXJhbS5o Ci1oZWFkZXIteSArPSBwZXJmX2V2ZW50LmgKLWhlYWRlci15ICs9IHBvbGwuaAotaGVhZGVyLXkg Kz0gcG9zaXhfdHlwZXMuaAotaGVhZGVyLXkgKz0gcHMzZmIuaAotaGVhZGVyLXkgKz0gcHRyYWNl LmgKLWhlYWRlci15ICs9IHJlc291cmNlLmgKLWhlYWRlci15ICs9IHNlbWJ1Zi5oCi1oZWFkZXIt eSArPSBzZXR1cC5oCi1oZWFkZXIteSArPSBzaG1idWYuaAotaGVhZGVyLXkgKz0gc2lnY29udGV4 dC5oCi1oZWFkZXIteSArPSBzaWdpbmZvLmgKLWhlYWRlci15ICs9IHNpZ25hbC5oCi1oZWFkZXIt eSArPSBzb2NrZXQuaAotaGVhZGVyLXkgKz0gc29ja2lvcy5oCi1oZWFkZXIteSArPSBzcHVfaW5m by5oCi1oZWFkZXIteSArPSBzdGF0LmgKLWhlYWRlci15ICs9IHN0YXRmcy5oCi1oZWFkZXIteSAr PSBzd2FiLmgKLWhlYWRlci15ICs9IHRlcm1iaXRzLmgKLWhlYWRlci15ICs9IHRlcm1pb3MuaAot aGVhZGVyLXkgKz0gdG0uaAotaGVhZGVyLXkgKz0gdHlwZXMuaAotaGVhZGVyLXkgKz0gdWNvbnRl eHQuaAotaGVhZGVyLXkgKz0gdW5pc3RkLmgKZGlmZiAtLWdpdCBhL2FyY2gvczM5MC9pbmNsdWRl L3VhcGkvYXNtL0tidWlsZCBiL2FyY2gvczM5MC9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAppbmRl eCBiZjczNmU3NjRjYjQuLmIxNWJmNmJjMGU5NCAxMDA2NDQKLS0tIGEvYXJjaC9zMzkwL2luY2x1 ZGUvdWFwaS9hc20vS2J1aWxkCisrKyBiL2FyY2gvczM5MC9pbmNsdWRlL3VhcGkvYXNtL0tidWls ZApAQCAtMSw1NCArMSwyIEBACiAjIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0CiBpbmNsdWRlIGlu Y2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVpbGQuYXNtCi0KLWhlYWRlci15ICs9IGF1eHZlYy5o Ci1oZWFkZXIteSArPSBiaXRzcGVybG9uZy5oCi1oZWFkZXIteSArPSBieXRlb3JkZXIuaAotaGVh ZGVyLXkgKz0gY2hwaWQuaAotaGVhZGVyLXkgKz0gY2hzYy5oCi1oZWFkZXIteSArPSBjbHAuaAot aGVhZGVyLXkgKz0gY21iLmgKLWhlYWRlci15ICs9IGRhc2QuaAotaGVhZGVyLXkgKz0gZGVidWcu aAotaGVhZGVyLXkgKz0gZXJybm8uaAotaGVhZGVyLXkgKz0gZmNudGwuaAotaGVhZGVyLXkgKz0g aHlwZnMuaAotaGVhZGVyLXkgKz0gaW9jdGwuaAotaGVhZGVyLXkgKz0gaW9jdGxzLmgKLWhlYWRl ci15ICs9IGlwY2J1Zi5oCi1oZWFkZXIteSArPSBrdm0uaAotaGVhZGVyLXkgKz0ga3ZtX3BhcmEu aAotaGVhZGVyLXkgKz0ga3ZtX3BlcmYuaAotaGVhZGVyLXkgKz0ga3ZtX3ZpcnRpby5oCi1oZWFk ZXIteSArPSBtbWFuLmgKLWhlYWRlci15ICs9IG1vbndyaXRlci5oCi1oZWFkZXIteSArPSBtc2di dWYuaAotaGVhZGVyLXkgKz0gcGFyYW0uaAotaGVhZGVyLXkgKz0gcG9sbC5oCi1oZWFkZXIteSAr PSBwb3NpeF90eXBlcy5oCi1oZWFkZXIteSArPSBwdHJhY2UuaAotaGVhZGVyLXkgKz0gcWV0aC5o Ci1oZWFkZXIteSArPSByZXNvdXJjZS5oCi1oZWFkZXIteSArPSBzY2hpZC5oCi1oZWFkZXIteSAr PSBzY2xwX2N0bC5oCi1oZWFkZXIteSArPSBzZW1idWYuaAotaGVhZGVyLXkgKz0gc2V0dXAuaAot aGVhZGVyLXkgKz0gc2htYnVmLmgKLWhlYWRlci15ICs9IHNpZS5oCi1oZWFkZXIteSArPSBzaWdj b250ZXh0LmgKLWhlYWRlci15ICs9IHNpZ2luZm8uaAotaGVhZGVyLXkgKz0gc2lnbmFsLmgKLWhl YWRlci15ICs9IHNvY2tldC5oCi1oZWFkZXIteSArPSBzb2NraW9zLmgKLWhlYWRlci15ICs9IHN0 YXQuaAotaGVhZGVyLXkgKz0gc3RhdGZzLmgKLWhlYWRlci15ICs9IHN3YWIuaAotaGVhZGVyLXkg Kz0gdGFwZTM5MC5oCi1oZWFkZXIteSArPSB0ZXJtYml0cy5oCi1oZWFkZXIteSArPSB0ZXJtaW9z LmgKLWhlYWRlci15ICs9IHR5cGVzLmgKLWhlYWRlci15ICs9IHVjb250ZXh0LmgKLWhlYWRlci15 ICs9IHVuaXN0ZC5oCi1oZWFkZXIteSArPSB2aXJ0aW8tY2N3LmgKLWhlYWRlci15ICs9IHZ0b2Mu aAotaGVhZGVyLXkgKz0gemNyeXB0LmgKZGlmZiAtLWdpdCBhL2FyY2gvc2NvcmUvaW5jbHVkZS9h c20vS2J1aWxkIGIvYXJjaC9zY29yZS9pbmNsdWRlL2FzbS9LYnVpbGQKaW5kZXggYTA1MjE4ZmYz ZmU0Li4xMjhjYTdlYzAyMjAgMTAwNjQ0Ci0tLSBhL2FyY2gvc2NvcmUvaW5jbHVkZS9hc20vS2J1 aWxkCisrKyBiL2FyY2gvc2NvcmUvaW5jbHVkZS9hc20vS2J1aWxkCkBAIC0xLDcgKzEsMyBAQAot Ci1oZWFkZXIteSArPQotCi0KIGdlbmVyaWMteSArPSBiYXJyaWVyLmgKIGdlbmVyaWMteSArPSBj bGtkZXYuaAogZ2VuZXJpYy15ICs9IGNwdXRpbWUuaApkaWZmIC0tZ2l0IGEvYXJjaC9zY29yZS9p bmNsdWRlL3VhcGkvYXNtL0tidWlsZCBiL2FyY2gvc2NvcmUvaW5jbHVkZS91YXBpL2FzbS9LYnVp bGQKaW5kZXggMDQwMTc4Y2RiM2ViLi5iMTViZjZiYzBlOTQgMTAwNjQ0Ci0tLSBhL2FyY2gvc2Nv cmUvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKKysrIGIvYXJjaC9zY29yZS9pbmNsdWRlL3VhcGkv YXNtL0tidWlsZApAQCAtMSwzNCArMSwyIEBACiAjIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0CiBp bmNsdWRlIGluY2x1ZGUvdWFwaS9hc20tZ2VuZXJpYy9LYnVpbGQuYXNtCi0KLWhlYWRlci15ICs9 IGF1eHZlYy5oCi1oZWFkZXIteSArPSBiaXRzcGVybG9uZy5oCi1oZWFkZXIteSArPSBieXRlb3Jk ZXIuaAotaGVhZGVyLXkgKz0gZXJybm8uaAotaGVhZGVyLXkgKz0gZmNudGwuaAotaGVhZGVyLXkg Kz0gaW9jdGwuaAotaGVhZGVyLXkgKz0gaW9jdGxzLmgKLWhlYWRlci15ICs9IGlwY2J1Zi5oCi1o ZWFkZXIteSArPSBrdm1fcGFyYS5oCi1oZWFkZXIteSArPSBtbWFuLmgKLWhlYWRlci15ICs9IG1z Z2J1Zi5oCi1oZWFkZXIteSArPSBwYXJhbS5oCi1oZWFkZXIteSArPSBwb2xsLmgKLWhlYWRlci15 ICs9IHBvc2l4X3R5cGVzLmgKLWhlYWRlci15ICs9IHB0cmFjZS5oCi1oZWFkZXIteSArPSByZXNv dXJjZS5oCi1oZWFkZXIteSArPSBzZW1idWYuaAotaGVhZGVyLXkgKz0gc2V0dXAuaAotaGVhZGVy LXkgKz0gc2htYnVmLmgKLWhlYWRlci15ICs9IHNpZ2NvbnRleHQuaAotaGVhZGVyLXkgKz0gc2ln aW5mby5oCi1oZWFkZXIteSArPSBzaWduYWwuaAotaGVhZGVyLXkgKz0gc29ja2V0LmgKLWhlYWRl ci15ICs9IHNvY2tpb3MuaAotaGVhZGVyLXkgKz0gc3RhdC5oCi1oZWFkZXIteSArPSBzdGF0ZnMu aAotaGVhZGVyLXkgKz0gc3dhYi5oCi1oZWFkZXIteSArPSB0ZXJtYml0cy5oCi1oZWFkZXIteSAr PSB0ZXJtaW9zLmgKLWhlYWRlci15ICs9IHR5cGVzLmgKLWhlYWRlci15ICs9IHVuaXN0ZC5oCmRp ZmYgLS1naXQgYS9hcmNoL3NoL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkIGIvYXJjaC9zaC9pbmNs dWRlL3VhcGkvYXNtL0tidWlsZAppbmRleCA2MDYxM2FlNzg1MTMuLmIxNWJmNmJjMGU5NCAxMDA2 NDQKLS0tIGEvYXJjaC9zaC9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAorKysgYi9hcmNoL3NoL2lu Y2x1ZGUvdWFwaS9hc20vS2J1aWxkCkBAIC0xLDI1ICsxLDIgQEAKICMgVUFQSSBIZWFkZXIgZXhw b3J0IGxpc3QKIGluY2x1ZGUgaW5jbHVkZS91YXBpL2FzbS1nZW5lcmljL0tidWlsZC5hc20KLQot aGVhZGVyLXkgKz0gYXV4dmVjLmgKLWhlYWRlci15ICs9IGJ5dGVvcmRlci5oCi1oZWFkZXIteSAr PSBjYWNoZWN0bC5oCi1oZWFkZXIteSArPSBjcHUtZmVhdHVyZXMuaAotaGVhZGVyLXkgKz0gaHdf YnJlYWtwb2ludC5oCi1oZWFkZXIteSArPSBpb2N0bHMuaAotaGVhZGVyLXkgKz0gcG9zaXhfdHlw ZXMuaAotaGVhZGVyLXkgKz0gcG9zaXhfdHlwZXNfMzIuaAotaGVhZGVyLXkgKz0gcG9zaXhfdHlw ZXNfNjQuaAotaGVhZGVyLXkgKz0gcHRyYWNlLmgKLWhlYWRlci15ICs9IHB0cmFjZV8zMi5oCi1o ZWFkZXIteSArPSBwdHJhY2VfNjQuaAotaGVhZGVyLXkgKz0gc2V0dXAuaAotaGVhZGVyLXkgKz0g c2lnY29udGV4dC5oCi1oZWFkZXIteSArPSBzaWduYWwuaAotaGVhZGVyLXkgKz0gc29ja2lvcy5o Ci1oZWFkZXIteSArPSBzdGF0LmgKLWhlYWRlci15ICs9IHN3YWIuaAotaGVhZGVyLXkgKz0gdHlw ZXMuaAotaGVhZGVyLXkgKz0gdW5pc3RkLmgKLWhlYWRlci15ICs9IHVuaXN0ZF8zMi5oCi1oZWFk ZXIteSArPSB1bmlzdGRfNjQuaApkaWZmIC0tZ2l0IGEvYXJjaC9zcGFyYy9pbmNsdWRlL3VhcGkv YXNtL0tidWlsZCBiL2FyY2gvc3BhcmMvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKaW5kZXggYjU4 NDNlZTA5ZmI1Li5iMTViZjZiYzBlOTQgMTAwNjQ0Ci0tLSBhL2FyY2gvc3BhcmMvaW5jbHVkZS91 YXBpL2FzbS9LYnVpbGQKKysrIGIvYXJjaC9zcGFyYy9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZApA QCAtMSw1MCArMSwyIEBACiAjIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci0jIFVzZXIgZXhwb3J0 ZWQgc3BhcmMgaGVhZGVyIGZpbGVzCi0KIGluY2x1ZGUgaW5jbHVkZS91YXBpL2FzbS1nZW5lcmlj L0tidWlsZC5hc20KLQotaGVhZGVyLXkgKz0gYXBjLmgKLWhlYWRlci15ICs9IGFzaS5oCi1oZWFk ZXIteSArPSBhdXh2ZWMuaAotaGVhZGVyLXkgKz0gYml0c3BlcmxvbmcuaAotaGVhZGVyLXkgKz0g Ynl0ZW9yZGVyLmgKLWhlYWRlci15ICs9IGRpc3BsYXk3c2VnLmgKLWhlYWRlci15ICs9IGVudmN0 cmwuaAotaGVhZGVyLXkgKz0gZXJybm8uaAotaGVhZGVyLXkgKz0gZmJpby5oCi1oZWFkZXIteSAr PSBmY250bC5oCi1oZWFkZXIteSArPSBpb2N0bC5oCi1oZWFkZXIteSArPSBpb2N0bHMuaAotaGVh ZGVyLXkgKz0gaXBjYnVmLmgKLWhlYWRlci15ICs9IGpzZmxhc2guaAotaGVhZGVyLXkgKz0ga3Zt X3BhcmEuaAotaGVhZGVyLXkgKz0gbW1hbi5oCi1oZWFkZXIteSArPSBtc2didWYuaAotaGVhZGVy LXkgKz0gb3BlbnByb21pby5oCi1oZWFkZXIteSArPSBwYXJhbS5oCi1oZWFkZXIteSArPSBwZXJm Y3RyLmgKLWhlYWRlci15ICs9IHBvbGwuaAotaGVhZGVyLXkgKz0gcG9zaXhfdHlwZXMuaAotaGVh ZGVyLXkgKz0gcHNyLmgKLWhlYWRlci15ICs9IHBzcmNvbXBhdC5oCi1oZWFkZXIteSArPSBwc3Rh dGUuaAotaGVhZGVyLXkgKz0gcHRyYWNlLmgKLWhlYWRlci15ICs9IHJlc291cmNlLmgKLWhlYWRl ci15ICs9IHNlbWJ1Zi5oCi1oZWFkZXIteSArPSBzZXR1cC5oCi1oZWFkZXIteSArPSBzaG1idWYu aAotaGVhZGVyLXkgKz0gc2lnY29udGV4dC5oCi1oZWFkZXIteSArPSBzaWdpbmZvLmgKLWhlYWRl ci15ICs9IHNpZ25hbC5oCi1oZWFkZXIteSArPSBzb2NrZXQuaAotaGVhZGVyLXkgKz0gc29ja2lv cy5oCi1oZWFkZXIteSArPSBzdGF0LmgKLWhlYWRlci15ICs9IHN0YXRmcy5oCi1oZWFkZXIteSAr PSBzd2FiLmgKLWhlYWRlci15ICs9IHRlcm1iaXRzLmgKLWhlYWRlci15ICs9IHRlcm1pb3MuaAot aGVhZGVyLXkgKz0gdHJhcHMuaAotaGVhZGVyLXkgKz0gdWN0eC5oCi1oZWFkZXIteSArPSB1bmlz dGQuaAotaGVhZGVyLXkgKz0gdXRyYXAuaAotaGVhZGVyLXkgKz0gd2F0Y2hkb2cuaApkaWZmIC0t Z2l0IGEvYXJjaC90aWxlL2luY2x1ZGUvYXNtL0tidWlsZCBiL2FyY2gvdGlsZS9pbmNsdWRlL2Fz bS9LYnVpbGQKaW5kZXggMmQxZjU2Mzg5NzRjLi4wNTdlYWE1MzM4NzcgMTAwNjQ0Ci0tLSBhL2Fy Y2gvdGlsZS9pbmNsdWRlL2FzbS9LYnVpbGQKKysrIGIvYXJjaC90aWxlL2luY2x1ZGUvYXNtL0ti dWlsZApAQCAtMSw2ICsxLDMgQEAKLQotaGVhZGVyLXkgKz0gLi4vYXJjaC8KLQogZ2VuZXJpYy15 ICs9IGJ1Zy5oCiBnZW5lcmljLXkgKz0gYnVncy5oCiBnZW5lcmljLXkgKz0gY2xrZGV2LmgKZGlm ZiAtLWdpdCBhL2FyY2gvdGlsZS9pbmNsdWRlL3VhcGkvYXJjaC9LYnVpbGQgYi9hcmNoL3RpbGUv aW5jbHVkZS91YXBpL2FyY2gvS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA5 N2RmYmVjZWM2YjYuLjAwMDAwMDAwMDAwMAotLS0gYS9hcmNoL3RpbGUvaW5jbHVkZS91YXBpL2Fy Y2gvS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsMTcgKzAsMCBAQAotIyBVQVBJIEhlYWRlciBl eHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gYWJpLmgKLWhlYWRlci15ICs9IGNoaXAuaAotaGVhZGVy LXkgKz0gY2hpcF90aWxlZ3guaAotaGVhZGVyLXkgKz0gY2hpcF90aWxlcHJvLmgKLWhlYWRlci15 ICs9IGljYWNoZS5oCi1oZWFkZXIteSArPSBpbnRlcnJ1cHRzLmgKLWhlYWRlci15ICs9IGludGVy cnVwdHNfMzIuaAotaGVhZGVyLXkgKz0gaW50ZXJydXB0c182NC5oCi1oZWFkZXIteSArPSBvcGNv ZGUuaAotaGVhZGVyLXkgKz0gb3Bjb2RlX3RpbGVneC5oCi1oZWFkZXIteSArPSBvcGNvZGVfdGls ZXByby5oCi1oZWFkZXIteSArPSBzaW0uaAotaGVhZGVyLXkgKz0gc2ltX2RlZi5oCi1oZWFkZXIt eSArPSBzcHJfZGVmLmgKLWhlYWRlci15ICs9IHNwcl9kZWZfMzIuaAotaGVhZGVyLXkgKz0gc3By X2RlZl82NC5oCmRpZmYgLS1naXQgYS9hcmNoL3RpbGUvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQg Yi9hcmNoL3RpbGUvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKaW5kZXggYzIwZGI4ZTQyOGJmLi5l MGE1MDExMWUwN2YgMTAwNjQ0Ci0tLSBhL2FyY2gvdGlsZS9pbmNsdWRlL3VhcGkvYXNtL0tidWls ZAorKysgYi9hcmNoL3RpbGUvaW5jbHVkZS91YXBpL2FzbS9LYnVpbGQKQEAgLTEsMjEgKzEsNiBA QAogIyBVQVBJIEhlYWRlciBleHBvcnQgbGlzdAogaW5jbHVkZSBpbmNsdWRlL3VhcGkvYXNtLWdl bmVyaWMvS2J1aWxkLmFzbQogCi1oZWFkZXIteSArPSBhdXh2ZWMuaAotaGVhZGVyLXkgKz0gYml0 c3BlcmxvbmcuaAotaGVhZGVyLXkgKz0gYnl0ZW9yZGVyLmgKLWhlYWRlci15ICs9IGNhY2hlY3Rs LmgKLWhlYWRlci15ICs9IGhhcmR3YWxsLmgKLWhlYWRlci15ICs9IGt2bV9wYXJhLmgKLWhlYWRl ci15ICs9IG1tYW4uaAotaGVhZGVyLXkgKz0gcHRyYWNlLmgKLWhlYWRlci15ICs9IHNldHVwLmgK LWhlYWRlci15ICs9IHNpZ2NvbnRleHQuaAotaGVhZGVyLXkgKz0gc2lnaW5mby5oCi1oZWFkZXIt eSArPSBzaWduYWwuaAotaGVhZGVyLXkgKz0gc3RhdC5oCi1oZWFkZXIteSArPSBzd2FiLmgKLWhl YWRlci15ICs9IHVjb250ZXh0LmgKLWhlYWRlci15ICs9IHVuaXN0ZC5oCi0KIGdlbmVyaWMteSAr PSB1Y29udGV4dC5oCisKK3N1YmRpci15ICs9IC4uL2FyY2gKZGlmZiAtLWdpdCBhL2FyY2gvdW5p Y29yZTMyL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkIGIvYXJjaC91bmljb3JlMzIvaW5jbHVkZS91 YXBpL2FzbS9LYnVpbGQKaW5kZXggMDUxNGQ3YWQ2ODU1Li4xM2E5N2FhMjI4NWYgMTAwNjQ0Ci0t LSBhL2FyY2gvdW5pY29yZTMyL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCisrKyBiL2FyY2gvdW5p Y29yZTMyL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCkBAIC0xLDEwICsxLDQgQEAKICMgVUFQSSBI ZWFkZXIgZXhwb3J0IGxpc3QKIGluY2x1ZGUgaW5jbHVkZS91YXBpL2FzbS1nZW5lcmljL0tidWls ZC5hc20KIAotaGVhZGVyLXkgKz0gYnl0ZW9yZGVyLmgKLWhlYWRlci15ICs9IGt2bV9wYXJhLmgK LWhlYWRlci15ICs9IHB0cmFjZS5oCi1oZWFkZXIteSArPSBzaWdjb250ZXh0LmgKLWhlYWRlci15 ICs9IHVuaXN0ZC5oCi0KIGdlbmVyaWMteSArPSBrdm1fcGFyYS5oCmRpZmYgLS1naXQgYS9hcmNo L3g4Ni9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZCBiL2FyY2gveDg2L2luY2x1ZGUvdWFwaS9hc20v S2J1aWxkCmluZGV4IDFjNTMyYjNmMThlYS4uODNiNmU5YTBkY2U0IDEwMDY0NAotLS0gYS9hcmNo L3g4Ni9pbmNsdWRlL3VhcGkvYXNtL0tidWlsZAorKysgYi9hcmNoL3g4Ni9pbmNsdWRlL3VhcGkv YXNtL0tidWlsZApAQCAtNCw2MSArNCwzIEBAIGluY2x1ZGUgaW5jbHVkZS91YXBpL2FzbS1nZW5l cmljL0tidWlsZC5hc20KIGdlbmhkci15ICs9IHVuaXN0ZF8zMi5oCiBnZW5oZHIteSArPSB1bmlz dGRfNjQuaAogZ2VuaGRyLXkgKz0gdW5pc3RkX3gzMi5oCi1oZWFkZXIteSArPSBhLm91dC5oCi1o ZWFkZXIteSArPSBhdXh2ZWMuaAotaGVhZGVyLXkgKz0gYml0c3BlcmxvbmcuaAotaGVhZGVyLXkg Kz0gYm9vdC5oCi1oZWFkZXIteSArPSBib290cGFyYW0uaAotaGVhZGVyLXkgKz0gYnl0ZW9yZGVy LmgKLWhlYWRlci15ICs9IGRlYnVncmVnLmgKLWhlYWRlci15ICs9IGU4MjAuaAotaGVhZGVyLXkg Kz0gZXJybm8uaAotaGVhZGVyLXkgKz0gZmNudGwuaAotaGVhZGVyLXkgKz0gaHdfYnJlYWtwb2lu dC5oCi1oZWFkZXIteSArPSBoeXBlcnYuaAotaGVhZGVyLXkgKz0gaW9jdGwuaAotaGVhZGVyLXkg Kz0gaW9jdGxzLmgKLWhlYWRlci15ICs9IGlwY2J1Zi5oCi1oZWFkZXIteSArPSBpc3QuaAotaGVh ZGVyLXkgKz0ga3ZtLmgKLWhlYWRlci15ICs9IGt2bV9wYXJhLmgKLWhlYWRlci15ICs9IGt2bV9w ZXJmLmgKLWhlYWRlci15ICs9IGxkdC5oCi1oZWFkZXIteSArPSBtY2UuaAotaGVhZGVyLXkgKz0g bW1hbi5oCi1oZWFkZXIteSArPSBtc2didWYuaAotaGVhZGVyLXkgKz0gbXNyLmgKLWhlYWRlci15 ICs9IG10cnIuaAotaGVhZGVyLXkgKz0gcGFyYW0uaAotaGVhZGVyLXkgKz0gcGVyZl9yZWdzLmgK LWhlYWRlci15ICs9IHBvbGwuaAotaGVhZGVyLXkgKz0gcG9zaXhfdHlwZXMuaAotaGVhZGVyLXkg Kz0gcG9zaXhfdHlwZXNfMzIuaAotaGVhZGVyLXkgKz0gcG9zaXhfdHlwZXNfNjQuaAotaGVhZGVy LXkgKz0gcG9zaXhfdHlwZXNfeDMyLmgKLWhlYWRlci15ICs9IHByY3RsLmgKLWhlYWRlci15ICs9 IHByb2Nlc3Nvci1mbGFncy5oCi1oZWFkZXIteSArPSBwdHJhY2UtYWJpLmgKLWhlYWRlci15ICs9 IHB0cmFjZS5oCi1oZWFkZXIteSArPSByZXNvdXJjZS5oCi1oZWFkZXIteSArPSBzZW1idWYuaAot aGVhZGVyLXkgKz0gc2V0dXAuaAotaGVhZGVyLXkgKz0gc2htYnVmLmgKLWhlYWRlci15ICs9IHNp Z2NvbnRleHQuaAotaGVhZGVyLXkgKz0gc2lnY29udGV4dDMyLmgKLWhlYWRlci15ICs9IHNpZ2lu Zm8uaAotaGVhZGVyLXkgKz0gc2lnbmFsLmgKLWhlYWRlci15ICs9IHNvY2tldC5oCi1oZWFkZXIt eSArPSBzb2NraW9zLmgKLWhlYWRlci15ICs9IHN0YXQuaAotaGVhZGVyLXkgKz0gc3RhdGZzLmgK LWhlYWRlci15ICs9IHN2bS5oCi1oZWFkZXIteSArPSBzd2FiLmgKLWhlYWRlci15ICs9IHRlcm1i aXRzLmgKLWhlYWRlci15ICs9IHRlcm1pb3MuaAotaGVhZGVyLXkgKz0gdHlwZXMuaAotaGVhZGVy LXkgKz0gdWNvbnRleHQuaAotaGVhZGVyLXkgKz0gdW5pc3RkLmgKLWhlYWRlci15ICs9IHZtODYu aAotaGVhZGVyLXkgKz0gdm14LmgKLWhlYWRlci15ICs9IHZzeXNjYWxsLmgKZGlmZiAtLWdpdCBh L2FyY2gveHRlbnNhL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkIGIvYXJjaC94dGVuc2EvaW5jbHVk ZS91YXBpL2FzbS9LYnVpbGQKaW5kZXggNTZhYWQ1NGU3ZmI3Li5iMTViZjZiYzBlOTQgMTAwNjQ0 Ci0tLSBhL2FyY2gveHRlbnNhL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCisrKyBiL2FyY2gveHRl bnNhL2luY2x1ZGUvdWFwaS9hc20vS2J1aWxkCkBAIC0xLDI1ICsxLDIgQEAKICMgVUFQSSBIZWFk ZXIgZXhwb3J0IGxpc3QKIGluY2x1ZGUgaW5jbHVkZS91YXBpL2FzbS1nZW5lcmljL0tidWlsZC5h c20KLQotaGVhZGVyLXkgKz0gYXV4dmVjLmgKLWhlYWRlci15ICs9IGJ5dGVvcmRlci5oCi1oZWFk ZXIteSArPSBpb2N0bHMuaAotaGVhZGVyLXkgKz0gaXBjYnVmLmgKLWhlYWRlci15ICs9IG1tYW4u aAotaGVhZGVyLXkgKz0gbXNnYnVmLmgKLWhlYWRlci15ICs9IHBhcmFtLmgKLWhlYWRlci15ICs9 IHBvbGwuaAotaGVhZGVyLXkgKz0gcG9zaXhfdHlwZXMuaAotaGVhZGVyLXkgKz0gcHRyYWNlLmgK LWhlYWRlci15ICs9IHNlbWJ1Zi5oCi1oZWFkZXIteSArPSBzZXR1cC5oCi1oZWFkZXIteSArPSBz aG1idWYuaAotaGVhZGVyLXkgKz0gc2lnY29udGV4dC5oCi1oZWFkZXIteSArPSBzaWduYWwuaAot aGVhZGVyLXkgKz0gc29ja2V0LmgKLWhlYWRlci15ICs9IHNvY2tpb3MuaAotaGVhZGVyLXkgKz0g c3RhdC5oCi1oZWFkZXIteSArPSBzd2FiLmgKLWhlYWRlci15ICs9IHRlcm1iaXRzLmgKLWhlYWRl ci15ICs9IHR5cGVzLmgKLWhlYWRlci15ICs9IHVuaXN0ZC5oCmRpZmYgLS1naXQgYS9pbmNsdWRl L0tidWlsZCBiL2luY2x1ZGUvS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBi YWIxMTQ1YmM3YTcuLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL0tidWlsZAorKysgL2Rldi9u dWxsCkBAIC0xLDIgKzAsMCBAQAotIyBUb3AtbGV2ZWwgTWFrZWZpbGUgY2FsbHMgaW50byBhc20t JChBUkNIKQotIyBMaXN0IG9ubHkgbm9uLWFyY2ggZGlyZWN0b3JpZXMgYmVsb3cKZGlmZiAtLWdp dCBhL2luY2x1ZGUvYXNtLWdlbmVyaWMvS2J1aWxkLmFzbSBiL2luY2x1ZGUvYXNtLWdlbmVyaWMv S2J1aWxkLmFzbQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZDJlZTg2YjRjMDkxLi4w MDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS9hc20tZ2VuZXJpYy9LYnVpbGQuYXNtCisrKyAvZGV2 L251bGwKQEAgLTEgKzAsMCBAQAotaW5jbHVkZSBpbmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMvS2J1 aWxkLmFzbQpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9zY3NpL2ZjL0tidWlsZCBiL2luY2x1ZGUvc2Nz aS9mYy9LYnVpbGQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGU2OWRlMjliYjJkMS4u MDAwMDAwMDAwMDAwCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvS2J1aWxkIGIvaW5jbHVkZS91 YXBpL0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMjQ1YWE2ZTA1ZTZhLi4w MDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS91YXBpL0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0x LDE1ICswLDAgQEAKLSMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKLSMgVG9wLWxldmVsIE1ha2Vm aWxlIGNhbGxzIGludG8gYXNtLSQoQVJDSCkKLSMgTGlzdCBvbmx5IG5vbi1hcmNoIGRpcmVjdG9y aWVzIGJlbG93Ci0KLQotaGVhZGVyLXkgKz0gYXNtLWdlbmVyaWMvCi1oZWFkZXIteSArPSBsaW51 eC8KLWhlYWRlci15ICs9IHNvdW5kLwotaGVhZGVyLXkgKz0gbXRkLwotaGVhZGVyLXkgKz0gcmRt YS8KLWhlYWRlci15ICs9IHZpZGVvLwotaGVhZGVyLXkgKz0gZHJtLwotaGVhZGVyLXkgKz0geGVu LwotaGVhZGVyLXkgKz0gc2NzaS8KLWhlYWRlci15ICs9IG1pc2MvCmRpZmYgLS1naXQgYS9pbmNs dWRlL3VhcGkvYXNtLWdlbmVyaWMvS2J1aWxkIGIvaW5jbHVkZS91YXBpL2FzbS1nZW5lcmljL0ti dWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggYjczZGU3YmI3YTYyLi4wMDAwMDAw MDAwMDAKLS0tIGEvaW5jbHVkZS91YXBpL2FzbS1nZW5lcmljL0tidWlsZAorKysgL2Rldi9udWxs CkBAIC0xLDM2ICswLDAgQEAKLSMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9 IGF1eHZlYy5oCi1oZWFkZXIteSArPSBiaXRzcGVybG9uZy5oCi1oZWFkZXIteSArPSBlcnJuby1i YXNlLmgKLWhlYWRlci15ICs9IGVycm5vLmgKLWhlYWRlci15ICs9IGZjbnRsLmgKLWhlYWRlci15 ICs9IGludC1sNjQuaAotaGVhZGVyLXkgKz0gaW50LWxsNjQuaAotaGVhZGVyLXkgKz0gaW9jdGwu aAotaGVhZGVyLXkgKz0gaW9jdGxzLmgKLWhlYWRlci15ICs9IGlwY2J1Zi5oCi1oZWFkZXIteSAr PSBrdm1fcGFyYS5oCi1oZWFkZXIteSArPSBtbWFuLWNvbW1vbi5oCi1oZWFkZXIteSArPSBtbWFu LmgKLWhlYWRlci15ICs9IG1zZ2J1Zi5oCi1oZWFkZXIteSArPSBwYXJhbS5oCi1oZWFkZXIteSAr PSBwb2xsLmgKLWhlYWRlci15ICs9IHBvc2l4X3R5cGVzLmgKLWhlYWRlci15ICs9IHJlc291cmNl LmgKLWhlYWRlci15ICs9IHNlbWJ1Zi5oCi1oZWFkZXIteSArPSBzZXR1cC5oCi1oZWFkZXIteSAr PSBzaG1idWYuaAotaGVhZGVyLXkgKz0gc2htcGFyYW0uaAotaGVhZGVyLXkgKz0gc2lnaW5mby5o Ci1oZWFkZXIteSArPSBzaWduYWwtZGVmcy5oCi1oZWFkZXIteSArPSBzaWduYWwuaAotaGVhZGVy LXkgKz0gc29ja2V0LmgKLWhlYWRlci15ICs9IHNvY2tpb3MuaAotaGVhZGVyLXkgKz0gc3RhdC5o Ci1oZWFkZXIteSArPSBzdGF0ZnMuaAotaGVhZGVyLXkgKz0gc3dhYi5oCi1oZWFkZXIteSArPSB0 ZXJtYml0cy5oCi1oZWFkZXIteSArPSB0ZXJtaW9zLmgKLWhlYWRlci15ICs9IHR5cGVzLmgKLWhl YWRlci15ICs9IHVjb250ZXh0LmgKLWhlYWRlci15ICs9IHVuaXN0ZC5oCmRpZmYgLS1naXQgYS9p bmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMvS2J1aWxkLmFzbSBiL2luY2x1ZGUvdWFwaS9hc20tZ2Vu ZXJpYy9LYnVpbGQuYXNtCmluZGV4IGZjZDUwYjc1OTIxNy4uOGU2YjMzNTY2NGYyIDEwMDY0NAot LS0gYS9pbmNsdWRlL3VhcGkvYXNtLWdlbmVyaWMvS2J1aWxkLmFzbQorKysgYi9pbmNsdWRlL3Vh cGkvYXNtLWdlbmVyaWMvS2J1aWxkLmFzbQpAQCAtOCwzOCArOCwzOCBAQCBvcHQtaGVhZGVyICs9 IGEub3V0LmgKICMKICMgSGVhZGVycyB0aGF0IGFyZSBtYW5kYXRvcnkgaW4gdXNyL2luY2x1ZGUv YXNtLwogIwotaGVhZGVyLXkgKz0gYXV4dmVjLmgKLWhlYWRlci15ICs9IGJpdHNwZXJsb25nLmgK LWhlYWRlci15ICs9IGJ5dGVvcmRlci5oCi1oZWFkZXIteSArPSBlcnJuby5oCi1oZWFkZXIteSAr PSBmY250bC5oCi1oZWFkZXIteSArPSBpb2N0bC5oCi1oZWFkZXIteSArPSBpb2N0bHMuaAotaGVh ZGVyLXkgKz0gaXBjYnVmLmgKLWhlYWRlci15ICs9IG1tYW4uaAotaGVhZGVyLXkgKz0gbXNnYnVm LmgKLWhlYWRlci15ICs9IHBhcmFtLmgKLWhlYWRlci15ICs9IHBvbGwuaAotaGVhZGVyLXkgKz0g cG9zaXhfdHlwZXMuaAotaGVhZGVyLXkgKz0gcHRyYWNlLmgKLWhlYWRlci15ICs9IHJlc291cmNl LmgKLWhlYWRlci15ICs9IHNlbWJ1Zi5oCi1oZWFkZXIteSArPSBzZXR1cC5oCi1oZWFkZXIteSAr PSBzaG1idWYuaAotaGVhZGVyLXkgKz0gc2lnY29udGV4dC5oCi1oZWFkZXIteSArPSBzaWdpbmZv LmgKLWhlYWRlci15ICs9IHNpZ25hbC5oCi1oZWFkZXIteSArPSBzb2NrZXQuaAotaGVhZGVyLXkg Kz0gc29ja2lvcy5oCi1oZWFkZXIteSArPSBzdGF0LmgKLWhlYWRlci15ICs9IHN0YXRmcy5oCi1o ZWFkZXIteSArPSBzd2FiLmgKLWhlYWRlci15ICs9IHRlcm1iaXRzLmgKLWhlYWRlci15ICs9IHRl cm1pb3MuaAotaGVhZGVyLXkgKz0gdHlwZXMuaAotaGVhZGVyLXkgKz0gdW5pc3RkLmgKK21hbmRh dG9yeS15ICs9IGF1eHZlYy5oCittYW5kYXRvcnkteSArPSBiaXRzcGVybG9uZy5oCittYW5kYXRv cnkteSArPSBieXRlb3JkZXIuaAorbWFuZGF0b3J5LXkgKz0gZXJybm8uaAorbWFuZGF0b3J5LXkg Kz0gZmNudGwuaAorbWFuZGF0b3J5LXkgKz0gaW9jdGwuaAorbWFuZGF0b3J5LXkgKz0gaW9jdGxz LmgKK21hbmRhdG9yeS15ICs9IGlwY2J1Zi5oCittYW5kYXRvcnkteSArPSBtbWFuLmgKK21hbmRh dG9yeS15ICs9IG1zZ2J1Zi5oCittYW5kYXRvcnkteSArPSBwYXJhbS5oCittYW5kYXRvcnkteSAr PSBwb2xsLmgKK21hbmRhdG9yeS15ICs9IHBvc2l4X3R5cGVzLmgKK21hbmRhdG9yeS15ICs9IHB0 cmFjZS5oCittYW5kYXRvcnkteSArPSByZXNvdXJjZS5oCittYW5kYXRvcnkteSArPSBzZW1idWYu aAorbWFuZGF0b3J5LXkgKz0gc2V0dXAuaAorbWFuZGF0b3J5LXkgKz0gc2htYnVmLmgKK21hbmRh dG9yeS15ICs9IHNpZ2NvbnRleHQuaAorbWFuZGF0b3J5LXkgKz0gc2lnaW5mby5oCittYW5kYXRv cnkteSArPSBzaWduYWwuaAorbWFuZGF0b3J5LXkgKz0gc29ja2V0LmgKK21hbmRhdG9yeS15ICs9 IHNvY2tpb3MuaAorbWFuZGF0b3J5LXkgKz0gc3RhdC5oCittYW5kYXRvcnkteSArPSBzdGF0ZnMu aAorbWFuZGF0b3J5LXkgKz0gc3dhYi5oCittYW5kYXRvcnkteSArPSB0ZXJtYml0cy5oCittYW5k YXRvcnkteSArPSB0ZXJtaW9zLmgKK21hbmRhdG9yeS15ICs9IHR5cGVzLmgKK21hbmRhdG9yeS15 ICs9IHVuaXN0ZC5oCiAKLWhlYWRlci15ICs9ICQoZm9yZWFjaCBoZHIsJChvcHQtaGVhZGVyKSwg XAorbWFuZGF0b3J5LXkgKz0gJChmb3JlYWNoIGhkciwkKG9wdC1oZWFkZXIpLCBcCiAJICAgICAg JChpZiBcCiAJCSQod2lsZGNhcmQgXAogCQkJJChzcmN0cmVlKS9hcmNoLyQoU1JDQVJDSCkvaW5j bHVkZS91YXBpL2FzbS8kKGhkcikgXApkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2RybS9LYnVp bGQgYi9pbmNsdWRlL3VhcGkvZHJtL0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggOTM1NWRkOGVmZjNiLi4wMDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS91YXBpL2RybS9LYnVp bGQKKysrIC9kZXYvbnVsbApAQCAtMSwyMiArMCwwIEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBs aXN0Ci1oZWFkZXIteSArPSBkcm0uaAotaGVhZGVyLXkgKz0gZHJtX2ZvdXJjYy5oCi1oZWFkZXIt eSArPSBkcm1fbW9kZS5oCi1oZWFkZXIteSArPSBkcm1fc2FyZWEuaAotaGVhZGVyLXkgKz0gYW1k Z3B1X2RybS5oCi1oZWFkZXIteSArPSBleHlub3NfZHJtLmgKLWhlYWRlci15ICs9IGk4MTBfZHJt LmgKLWhlYWRlci15ICs9IGk5MTVfZHJtLmgKLWhlYWRlci15ICs9IG1nYV9kcm0uaAotaGVhZGVy LXkgKz0gbm91dmVhdV9kcm0uaAotaGVhZGVyLXkgKz0gcXhsX2RybS5oCi1oZWFkZXIteSArPSBy MTI4X2RybS5oCi1oZWFkZXIteSArPSByYWRlb25fZHJtLmgKLWhlYWRlci15ICs9IHNhdmFnZV9k cm0uaAotaGVhZGVyLXkgKz0gc2lzX2RybS5oCi1oZWFkZXIteSArPSB0ZWdyYV9kcm0uaAotaGVh ZGVyLXkgKz0gdmlhX2RybS5oCi1oZWFkZXIteSArPSB2bXdnZnhfZHJtLmgKLWhlYWRlci15ICs9 IG1zbV9kcm0uaAotaGVhZGVyLXkgKz0gdmM0X2RybS5oCi1oZWFkZXIteSArPSB2aXJ0Z3B1X2Ry bS5oCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvbGludXgvS2J1aWxkIGIvaW5jbHVkZS91YXBp L2xpbnV4L0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZjMzMGJhNDU0N2Nm Li4wMDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS91YXBpL2xpbnV4L0tidWlsZAorKysgL2Rldi9u dWxsCkBAIC0xLDQ4MyArMCwwIEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIt eSArPSBhbmRyb2lkLwotaGVhZGVyLXkgKz0gYnl0ZW9yZGVyLwotaGVhZGVyLXkgKz0gY2FuLwot aGVhZGVyLXkgKz0gY2FpZi8KLWhlYWRlci15ICs9IGR2Yi8KLWhlYWRlci15ICs9IGhkbGMvCi1o ZWFkZXIteSArPSBoc2kvCi1oZWFkZXIteSArPSBpaW8vCi1oZWFkZXIteSArPSBpc2RuLwotaGVh ZGVyLXkgKz0gbW1jLwotaGVhZGVyLXkgKz0gbmZzZC8KLWhlYWRlci15ICs9IHJhaWQvCi1oZWFk ZXIteSArPSBzcGkvCi1oZWFkZXIteSArPSBzdW5ycGMvCi1oZWFkZXIteSArPSB0Y19hY3QvCi1o ZWFkZXIteSArPSB0Y19lbWF0Y2gvCi1oZWFkZXIteSArPSBuZXRmaWx0ZXIvCi1oZWFkZXIteSAr PSBuZXRmaWx0ZXJfYXJwLwotaGVhZGVyLXkgKz0gbmV0ZmlsdGVyX2JyaWRnZS8KLWhlYWRlci15 ICs9IG5ldGZpbHRlcl9pcHY0LwotaGVhZGVyLXkgKz0gbmV0ZmlsdGVyX2lwdjYvCi1oZWFkZXIt eSArPSB1c2IvCi1oZWFkZXIteSArPSB3aW1heC8KLQotZ2VuaGRyLXkgKz0gdmVyc2lvbi5oCi0K LWlmbmVxICgkKHdpbGRjYXJkICQoc3JjdHJlZSkvYXJjaC8kKFNSQ0FSQ0gpL2luY2x1ZGUvdWFw aS9hc20vYS5vdXQuaCBcCi0JCSAgJChzcmN0cmVlKS9hcmNoLyQoU1JDQVJDSCkvaW5jbHVkZS9h c20vYS5vdXQuaCksKQotaGVhZGVyLXkgKz0gYS5vdXQuaAotZW5kaWYKLQotaGVhZGVyLXkgKz0g YWNjdC5oCi1oZWFkZXIteSArPSBhZGIuaAotaGVhZGVyLXkgKz0gYWRmc19mcy5oCi1oZWFkZXIt eSArPSBhZmZzX2hhcmRibG9ja3MuaAotaGVhZGVyLXkgKz0gYWdwZ2FydC5oCi1oZWFkZXIteSAr PSBhaW9fYWJpLmgKLWhlYWRlci15ICs9IGFtNDM3eC12cGZlLmgKLWhlYWRlci15ICs9IGFwbV9i aW9zLmgKLWhlYWRlci15ICs9IGFyY2ZiLmgKLWhlYWRlci15ICs9IGF0YWxrLmgKLWhlYWRlci15 ICs9IGF0bWFwaS5oCi1oZWFkZXIteSArPSBhdG1hcnAuaAotaGVhZGVyLXkgKz0gYXRtYnIyNjg0 LmgKLWhlYWRlci15ICs9IGF0bWNsaXAuaAotaGVhZGVyLXkgKz0gYXRtZGV2LmgKLWhlYWRlci15 ICs9IGF0bV9lbmkuaAotaGVhZGVyLXkgKz0gYXRtLmgKLWhlYWRlci15ICs9IGF0bV9oZS5oCi1o ZWFkZXIteSArPSBhdG1faWR0NzcxMDUuaAotaGVhZGVyLXkgKz0gYXRtaW9jLmgKLWhlYWRlci15 ICs9IGF0bWxlYy5oCi1oZWFkZXIteSArPSBhdG1tcGMuaAotaGVhZGVyLXkgKz0gYXRtX25pY3N0 YXIuaAotaGVhZGVyLXkgKz0gYXRtcHBwLmgKLWhlYWRlci15ICs9IGF0bXNhcC5oCi1oZWFkZXIt eSArPSBhdG1zdmMuaAotaGVhZGVyLXkgKz0gYXRtX3RjcC5oCi1oZWFkZXIteSArPSBhdG1femF0 bS5oCi1oZWFkZXIteSArPSBhdWRpdC5oCi1oZWFkZXIteSArPSBhdXRvX2ZzNC5oCi1oZWFkZXIt eSArPSBhdXRvX2ZzLmgKLWhlYWRlci15ICs9IGF1eHZlYy5oCi1oZWFkZXIteSArPSBheDI1LmgK LWhlYWRlci15ICs9IGIxbGxpLmgKLWhlYWRlci15ICs9IGJheWNvbS5oCi1oZWFkZXIteSArPSBi Y205MzN4eF9oY3MuaAotaGVhZGVyLXkgKz0gYmZzX2ZzLmgKLWhlYWRlci15ICs9IGJpbmZtdHMu aAotaGVhZGVyLXkgKz0gYmxrcGcuaAotaGVhZGVyLXkgKz0gYmxrdHJhY2VfYXBpLmgKLWhlYWRl ci15ICs9IGJsa3pvbmVkLmgKLWhlYWRlci15ICs9IGJwZl9jb21tb24uaAotaGVhZGVyLXkgKz0g YnBmX3BlcmZfZXZlbnQuaAotaGVhZGVyLXkgKz0gYnBmLmgKLWhlYWRlci15ICs9IGJwcWV0aGVy LmgKLWhlYWRlci15ICs9IGJzZy5oCi1oZWFkZXIteSArPSBidC1ibWMuaAotaGVhZGVyLXkgKz0g YnRyZnMuaAotaGVhZGVyLXkgKz0gY2FuLmgKLWhlYWRlci15ICs9IGNhcGFiaWxpdHkuaAotaGVh ZGVyLXkgKz0gY2FwaS5oCi1oZWFkZXIteSArPSBjY2lzc19kZWZzLmgKLWhlYWRlci15ICs9IGNj aXNzX2lvY3RsLmgKLWhlYWRlci15ICs9IGNkcm9tLmgKLWhlYWRlci15ICs9IGNlYy5oCi1oZWFk ZXIteSArPSBjZWMtZnVuY3MuaAotaGVhZGVyLXkgKz0gY2dyb3Vwc3RhdHMuaAotaGVhZGVyLXkg Kz0gY2hpby5oCi1oZWFkZXIteSArPSBjbTQwMDBfY3MuaAotaGVhZGVyLXkgKz0gY25fcHJvYy5o Ci1oZWFkZXIteSArPSBjb2RhLmgKLWhlYWRlci15ICs9IGNvZGFfcHNkZXYuaAotaGVhZGVyLXkg Kz0gY29mZi5oCi1oZWFkZXIteSArPSBjb25uZWN0b3IuaAotaGVhZGVyLXkgKz0gY29uc3QuaAot aGVhZGVyLXkgKz0gY3JhbWZzX2ZzLmgKLWhlYWRlci15ICs9IGN1ZGEuaAotaGVhZGVyLXkgKz0g Y3ljbGFkZXMuaAotaGVhZGVyLXkgKz0gY3ljeF9jZm0uaAotaGVhZGVyLXkgKz0gZGNibmwuaAot aGVhZGVyLXkgKz0gZGNjcC5oCi1oZWFkZXIteSArPSBkZXZsaW5rLmgKLWhlYWRlci15ICs9IGRs bWNvbnN0YW50cy5oCi1oZWFkZXIteSArPSBkbG1fZGV2aWNlLmgKLWhlYWRlci15ICs9IGRsbS5o Ci1oZWFkZXIteSArPSBkbG1fbmV0bGluay5oCi1oZWFkZXIteSArPSBkbG1fcGxvY2suaAotaGVh ZGVyLXkgKz0gZG0taW9jdGwuaAotaGVhZGVyLXkgKz0gZG0tbG9nLXVzZXJzcGFjZS5oCi1oZWFk ZXIteSArPSBkbi5oCi1oZWFkZXIteSArPSBkcWJsa194ZnMuaAotaGVhZGVyLXkgKz0gZWRkLmgK LWhlYWRlci15ICs9IGVmc19mc19zYi5oCi1oZWFkZXIteSArPSBlbGZjb3JlLmgKLWhlYWRlci15 ICs9IGVsZi1lbS5oCi1oZWFkZXIteSArPSBlbGYtZmRwaWMuaAotaGVhZGVyLXkgKz0gZWxmLmgK LWhlYWRlci15ICs9IGVycm5vLmgKLWhlYWRlci15ICs9IGVycnF1ZXVlLmgKLWhlYWRlci15ICs9 IGV0aHRvb2wuaAotaGVhZGVyLXkgKz0gZXZlbnRwb2xsLmgKLWhlYWRlci15ICs9IGZhZHZpc2Uu aAotaGVhZGVyLXkgKz0gZmFsbG9jLmgKLWhlYWRlci15ICs9IGZhbm90aWZ5LmgKLWhlYWRlci15 ICs9IGZiLmgKLWhlYWRlci15ICs9IGZjbnRsLmgKLWhlYWRlci15ICs9IGZkLmgKLWhlYWRlci15 ICs9IGZkcmVnLmgKLWhlYWRlci15ICs9IGZpYl9ydWxlcy5oCi1oZWFkZXIteSArPSBmaWVtYXAu aAotaGVhZGVyLXkgKz0gZmlsdGVyLmgKLWhlYWRlci15ICs9IGZpcmV3aXJlLWNkZXYuaAotaGVh ZGVyLXkgKz0gZmlyZXdpcmUtY29uc3RhbnRzLmgKLWhlYWRlci15ICs9IGZsYXQuaAotaGVhZGVy LXkgKz0gZm91LmgKLWhlYWRlci15ICs9IGZzLmgKLWhlYWRlci15ICs9IGZzbF9oeXBlcnZpc29y LmgKLWhlYWRlci15ICs9IGZ1c2UuaAotaGVhZGVyLXkgKz0gZnV0ZXguaAotaGVhZGVyLXkgKz0g Z2FtZXBvcnQuaAotaGVhZGVyLXkgKz0gZ2VuZXRsaW5rLmgKLWhlYWRlci15ICs9IGdlbl9zdGF0 cy5oCi1oZWFkZXIteSArPSBnZnMyX29uZGlzay5oCi1oZWFkZXIteSArPSBnaWdhc2V0X2Rldi5o Ci1oZWFkZXIteSArPSBncGlvLmgKLWhlYWRlci15ICs9IGdzbW11eC5oCi1oZWFkZXIteSArPSBn dHAuaAotaGVhZGVyLXkgKz0gaGRsY2Rydi5oCi1oZWFkZXIteSArPSBoZGxjLmgKLWhlYWRlci15 ICs9IGhkcmVnLmgKLWhlYWRlci15ICs9IGhpZGRldi5oCi1oZWFkZXIteSArPSBoaWQuaAotaGVh ZGVyLXkgKz0gaGlkcmF3LmgKLWhlYWRlci15ICs9IGhwZXQuaAotaGVhZGVyLXkgKz0gaHNyX25l dGxpbmsuaAotaGVhZGVyLXkgKz0gaHlwZXJ2LmgKLWhlYWRlci15ICs9IGh5c2RuX2lmLmgKLWhl YWRlci15ICs9IGkyYy1kZXYuaAotaGVhZGVyLXkgKz0gaTJjLmgKLWhlYWRlci15ICs9IGkyby1k ZXYuaAotaGVhZGVyLXkgKz0gaThrLmgKLWhlYWRlci15ICs9IGljbXAuaAotaGVhZGVyLXkgKz0g aWNtcHY2LmgKLWhlYWRlci15ICs9IGlmX2FkZHIuaAotaGVhZGVyLXkgKz0gaWZfYWRkcmxhYmVs LmgKLWhlYWRlci15ICs9IGlmX2FsZy5oCi1oZWFkZXIteSArPSBpZl9hcmNuZXQuaAotaGVhZGVy LXkgKz0gaWZfYXJwLmgKLWhlYWRlci15ICs9IGlmX2JvbmRpbmcuaAotaGVhZGVyLXkgKz0gaWZf YnJpZGdlLmgKLWhlYWRlci15ICs9IGlmX2NhYmxlbW9kZW0uaAotaGVhZGVyLXkgKz0gaWZfZXFs LmgKLWhlYWRlci15ICs9IGlmX2V0aGVyLmgKLWhlYWRlci15ICs9IGlmX2ZjLmgKLWhlYWRlci15 ICs9IGlmX2ZkZGkuaAotaGVhZGVyLXkgKz0gaWZfZnJhZC5oCi1oZWFkZXIteSArPSBpZi5oCi1o ZWFkZXIteSArPSBpZl9oaXBwaS5oCi1oZWFkZXIteSArPSBpZl9pbmZpbmliYW5kLmgKLWhlYWRl ci15ICs9IGlmX2xpbmsuaAotaGVhZGVyLXkgKz0gaWZfbHRhbGsuaAotaGVhZGVyLXkgKz0gaWZf bWFjc2VjLmgKLWhlYWRlci15ICs9IGlmX3BhY2tldC5oCi1oZWFkZXIteSArPSBpZl9waG9uZXQu aAotaGVhZGVyLXkgKz0gaWZfcGxpcC5oCi1oZWFkZXIteSArPSBpZl9wcHAuaAotaGVhZGVyLXkg Kz0gaWZfcHBwb2wydHAuaAotaGVhZGVyLXkgKz0gaWZfcHBwb3guaAotaGVhZGVyLXkgKz0gaWZf c2xpcC5oCi1oZWFkZXIteSArPSBpZl90ZWFtLmgKLWhlYWRlci15ICs9IGlmX3R1bi5oCi1oZWFk ZXIteSArPSBpZl90dW5uZWwuaAotaGVhZGVyLXkgKz0gaWZfdmxhbi5oCi1oZWFkZXIteSArPSBp Zl94MjUuaAotaGVhZGVyLXkgKz0gaWdtcC5oCi1oZWFkZXIteSArPSBpbGEuaAotaGVhZGVyLXkg Kz0gaW42LmgKLWhlYWRlci15ICs9IGluZXRfZGlhZy5oCi1oZWFkZXIteSArPSBpbi5oCi1oZWFk ZXIteSArPSBpbm90aWZ5LmgKLWhlYWRlci15ICs9IGlucHV0LmgKLWhlYWRlci15ICs9IGlucHV0 LWV2ZW50LWNvZGVzLmgKLWhlYWRlci15ICs9IGluX3JvdXRlLmgKLWhlYWRlci15ICs9IGlvY3Rs LmgKLWhlYWRlci15ICs9IGlwNl90dW5uZWwuaAotaGVhZGVyLXkgKz0gaXBjLmgKLWhlYWRlci15 ICs9IGlwLmgKLWhlYWRlci15ICs9IGlwbWkuaAotaGVhZGVyLXkgKz0gaXBtaV9tc2dkZWZzLmgK LWhlYWRlci15ICs9IGlwc2VjLmgKLWhlYWRlci15ICs9IGlwdjYuaAotaGVhZGVyLXkgKz0gaXB2 Nl9yb3V0ZS5oCi1oZWFkZXIteSArPSBpcF92cy5oCi1oZWFkZXIteSArPSBpcHguaAotaGVhZGVy LXkgKz0gaXJkYS5oCi1oZWFkZXIteSArPSBpcnFuci5oCi1oZWFkZXIteSArPSBpc2RuX2RpdmVy dGlmLmgKLWhlYWRlci15ICs9IGlzZG4uaAotaGVhZGVyLXkgKz0gaXNkbmlmLmgKLWhlYWRlci15 ICs9IGlzZG5fcHBwLmgKLWhlYWRlci15ICs9IGlzb19mcy5oCi1oZWFkZXIteSArPSBpdnR2ZmIu aAotaGVhZGVyLXkgKz0gaXZ0di5oCi1oZWFkZXIteSArPSBpeGp1c2VyLmgKLWhlYWRlci15ICs9 IGpmZnMyLmgKLWhlYWRlci15ICs9IGpveXN0aWNrLmgKLWhlYWRlci15ICs9IGtjbXAuaAotaGVh ZGVyLXkgKz0ga2Rldl90LmgKLWhlYWRlci15ICs9IGtkLmgKLWhlYWRlci15ICs9IGtlcm5lbGNh cGkuaAotaGVhZGVyLXkgKz0ga2VybmVsLmgKLWhlYWRlci15ICs9IGtlcm5lbC1wYWdlLWZsYWdz LmgKLWhlYWRlci15ICs9IGtleGVjLmgKLWhlYWRlci15ICs9IGtleWJvYXJkLmgKLWhlYWRlci15 ICs9IGtleWN0bC5oCi0KLWlmbmVxICgkKHdpbGRjYXJkICQoc3JjdHJlZSkvYXJjaC8kKFNSQ0FS Q0gpL2luY2x1ZGUvdWFwaS9hc20va3ZtLmggXAotCQkgICQoc3JjdHJlZSkvYXJjaC8kKFNSQ0FS Q0gpL2luY2x1ZGUvYXNtL2t2bS5oKSwpCi1oZWFkZXIteSArPSBrdm0uaAotZW5kaWYKLQotCi1p Zm5lcSAoJCh3aWxkY2FyZCAkKHNyY3RyZWUpL2FyY2gvJChTUkNBUkNIKS9pbmNsdWRlL3VhcGkv YXNtL2t2bV9wYXJhLmggXAotCQkgICQoc3JjdHJlZSkvYXJjaC8kKFNSQ0FSQ0gpL2luY2x1ZGUv YXNtL2t2bV9wYXJhLmgpLCkKLWhlYWRlci15ICs9IGt2bV9wYXJhLmgKLWVuZGlmCi0KLWhlYWRl ci15ICs9IGh3X2JyZWFrcG9pbnQuaAotaGVhZGVyLXkgKz0gbDJ0cC5oCi1oZWFkZXIteSArPSBs aWJjLWNvbXBhdC5oCi1oZWFkZXIteSArPSBsaXJjLmgKLWhlYWRlci15ICs9IGxpbWl0cy5oCi1o ZWFkZXIteSArPSBsbGMuaAotaGVhZGVyLXkgKz0gbG9vcC5oCi1oZWFkZXIteSArPSBscC5oCi1o ZWFkZXIteSArPSBsd3R1bm5lbC5oCi1oZWFkZXIteSArPSBtYWdpYy5oCi1oZWFkZXIteSArPSBt YWpvci5oCi1oZWFkZXIteSArPSBtYXBfdG9fN3NlZ21lbnQuaAotaGVhZGVyLXkgKz0gbWF0cm94 ZmIuaAotaGVhZGVyLXkgKz0gbWRpby5oCi1oZWFkZXIteSArPSBtZWRpYS5oCi1oZWFkZXIteSAr PSBtZWRpYS1idXMtZm9ybWF0LmgKLWhlYWRlci15ICs9IG1laS5oCi1oZWFkZXIteSArPSBtZW1i YXJyaWVyLmgKLWhlYWRlci15ICs9IG1lbWZkLmgKLWhlYWRlci15ICs9IG1lbXBvbGljeS5oCi1o ZWFkZXIteSArPSBtZXllLmgKLWhlYWRlci15ICs9IG1pY19jb21tb24uaAotaGVhZGVyLXkgKz0g bWljX2lvY3RsLmgKLWhlYWRlci15ICs9IG1paS5oCi1oZWFkZXIteSArPSBtaW5peF9mcy5oCi1o ZWFkZXIteSArPSBtbWFuLmgKLWhlYWRlci15ICs9IG1tdGltZXIuaAotaGVhZGVyLXkgKz0gbXBs cy5oCi1oZWFkZXIteSArPSBtcGxzX2lwdHVubmVsLmgKLWhlYWRlci15ICs9IG1xdWV1ZS5oCi1o ZWFkZXIteSArPSBtcm91dGU2LmgKLWhlYWRlci15ICs9IG1yb3V0ZS5oCi1oZWFkZXIteSArPSBt c2Rvc19mcy5oCi1oZWFkZXIteSArPSBtc2cuaAotaGVhZGVyLXkgKz0gbXRpby5oCi1oZWFkZXIt eSArPSBuYmQuaAotaGVhZGVyLXkgKz0gbmNwX2ZzLmgKLWhlYWRlci15ICs9IG5jcC5oCi1oZWFk ZXIteSArPSBuY3BfbW91bnQuaAotaGVhZGVyLXkgKz0gbmNwX25vLmgKLWhlYWRlci15ICs9IG5k Y3RsLmgKLWhlYWRlci15ICs9IG5laWdoYm91ci5oCi1oZWFkZXIteSArPSBuZXRjb25mLmgKLWhl YWRlci15ICs9IG5ldGRldmljZS5oCi1oZWFkZXIteSArPSBuZXRfZHJvcG1vbi5oCi1oZWFkZXIt eSArPSBuZXRmaWx0ZXJfYXJwLmgKLWhlYWRlci15ICs9IG5ldGZpbHRlcl9icmlkZ2UuaAotaGVh ZGVyLXkgKz0gbmV0ZmlsdGVyX2RlY25ldC5oCi1oZWFkZXIteSArPSBuZXRmaWx0ZXIuaAotaGVh ZGVyLXkgKz0gbmV0ZmlsdGVyX2lwdjQuaAotaGVhZGVyLXkgKz0gbmV0ZmlsdGVyX2lwdjYuaAot aGVhZGVyLXkgKz0gbmV0LmgKLWhlYWRlci15ICs9IG5ldGxpbmtfZGlhZy5oCi1oZWFkZXIteSAr PSBuZXRsaW5rLmgKLWhlYWRlci15ICs9IG5ldHJvbS5oCi1oZWFkZXIteSArPSBuZXRfbmFtZXNw YWNlLmgKLWhlYWRlci15ICs9IG5ldF90c3RhbXAuaAotaGVhZGVyLXkgKz0gbmZjLmgKLWhlYWRl ci15ICs9IG5mczIuaAotaGVhZGVyLXkgKz0gbmZzMy5oCi1oZWFkZXIteSArPSBuZnM0LmgKLWhl YWRlci15ICs9IG5mczRfbW91bnQuaAotaGVhZGVyLXkgKz0gbmZzYWNsLmgKLWhlYWRlci15ICs9 IG5mc19mcy5oCi1oZWFkZXIteSArPSBuZnMuaAotaGVhZGVyLXkgKz0gbmZzX2lkbWFwLmgKLWhl YWRlci15ICs9IG5mc19tb3VudC5oCi1oZWFkZXIteSArPSBubDgwMjExLmgKLWhlYWRlci15ICs9 IG5fcjM5NjQuaAotaGVhZGVyLXkgKz0gbnVidXMuaAotaGVhZGVyLXkgKz0gbnZtZV9pb2N0bC5o Ci1oZWFkZXIteSArPSBudnJhbS5oCi1oZWFkZXIteSArPSBvbWFwM2lzcC5oCi1oZWFkZXIteSAr PSBvbWFwZmIuaAotaGVhZGVyLXkgKz0gb29tLmgKLWhlYWRlci15ICs9IG9wZW52c3dpdGNoLmgK LWhlYWRlci15ICs9IHBhY2tldF9kaWFnLmgKLWhlYWRlci15ICs9IHBhcmFtLmgKLWhlYWRlci15 ICs9IHBhcnBvcnQuaAotaGVhZGVyLXkgKz0gcGF0Y2hrZXkuaAotaGVhZGVyLXkgKz0gcGNpLmgK LWhlYWRlci15ICs9IHBjaV9yZWdzLmgKLWhlYWRlci15ICs9IHBlcmZfZXZlbnQuaAotaGVhZGVy LXkgKz0gcGVyc29uYWxpdHkuaAotaGVhZGVyLXkgKz0gcGZrZXl2Mi5oCi1oZWFkZXIteSArPSBw Zy5oCi1oZWFkZXIteSArPSBwaGFudG9tLmgKLWhlYWRlci15ICs9IHBob25ldC5oCi1oZWFkZXIt eSArPSBwa3RjZHZkLmgKLWhlYWRlci15ICs9IHBrdF9jbHMuaAotaGVhZGVyLXkgKz0gcGt0X3Nj aGVkLmgKLWhlYWRlci15ICs9IHBtdS5oCi1oZWFkZXIteSArPSBwb2xsLmgKLWhlYWRlci15ICs9 IHBvc2l4X2FjbC5oCi1oZWFkZXIteSArPSBwb3NpeF9hY2xfeGF0dHIuaAotaGVhZGVyLXkgKz0g cG9zaXhfdHlwZXMuaAotaGVhZGVyLXkgKz0gcHBkZXYuaAotaGVhZGVyLXkgKz0gcHBwLWNvbXAu aAotaGVhZGVyLXkgKz0gcHBwX2RlZnMuaAotaGVhZGVyLXkgKz0gcHBwLWlvY3RsLmgKLWhlYWRl ci15ICs9IHBwcy5oCi1oZWFkZXIteSArPSBwcmN0bC5oCi1oZWFkZXIteSArPSBwc2NpLmgKLWhl YWRlci15ICs9IHB0cF9jbG9jay5oCi1oZWFkZXIteSArPSBwdHJhY2UuaAotaGVhZGVyLXkgKz0g cW54NF9mcy5oCi1oZWFkZXIteSArPSBxbnh0eXBlcy5oCi1oZWFkZXIteSArPSBxdW90YS5oCi1o ZWFkZXIteSArPSByYWRlb25mYi5oCi1oZWFkZXIteSArPSByYW5kb20uaAotaGVhZGVyLXkgKz0g cmF3LmgKLWhlYWRlci15ICs9IHJkcy5oCi1oZWFkZXIteSArPSByZWJvb3QuaAotaGVhZGVyLXkg Kz0gcmVpc2VyZnNfZnMuaAotaGVhZGVyLXkgKz0gcmVpc2VyZnNfeGF0dHIuaAotaGVhZGVyLXkg Kz0gcmVzb3VyY2UuaAotaGVhZGVyLXkgKz0gcmZraWxsLmgKLWhlYWRlci15ICs9IHJpb19jbV9j ZGV2LmgKLWhlYWRlci15ICs9IHJpb19tcG9ydF9jZGV2LmgKLWhlYWRlci15ICs9IHJvbWZzX2Zz LmgKLWhlYWRlci15ICs9IHJvc2UuaAotaGVhZGVyLXkgKz0gcm91dGUuaAotaGVhZGVyLXkgKz0g cnRjLmgKLWhlYWRlci15ICs9IHJ0bmV0bGluay5oCi1oZWFkZXIteSArPSBzY2MuaAotaGVhZGVy LXkgKz0gc2NoZWQuaAotaGVhZGVyLXkgKz0gc2NpZl9pb2N0bC5oCi1oZWFkZXIteSArPSBzY3Jl ZW5faW5mby5oCi1oZWFkZXIteSArPSBzY3RwLmgKLWhlYWRlci15ICs9IHNkbGEuaAotaGVhZGVy LXkgKz0gc2VjY29tcC5oCi1oZWFkZXIteSArPSBzZWN1cmViaXRzLmgKLWhlYWRlci15ICs9IHNl bGludXhfbmV0bGluay5oCi1oZWFkZXIteSArPSBzZW0uaAotaGVhZGVyLXkgKz0gc2VyaWFsX2Nv cmUuaAotaGVhZGVyLXkgKz0gc2VyaWFsLmgKLWhlYWRlci15ICs9IHNlcmlhbF9yZWcuaAotaGVh ZGVyLXkgKz0gc2VyaW8uaAotaGVhZGVyLXkgKz0gc2htLmgKLWhlYWRlci15ICs9IHNpZ25hbGZk LmgKLWhlYWRlci15ICs9IHNpZ25hbC5oCi1oZWFkZXIteSArPSBzbWlhcHAuaAotaGVhZGVyLXkg Kz0gc25tcC5oCi1oZWFkZXIteSArPSBzb2NrX2RpYWcuaAotaGVhZGVyLXkgKz0gc29ja2V0LmgK LWhlYWRlci15ICs9IHNvY2tpb3MuaAotaGVhZGVyLXkgKz0gc29uZXQuaAotaGVhZGVyLXkgKz0g c29ueXBpLmgKLWhlYWRlci15ICs9IHNvdW5kY2FyZC5oCi1oZWFkZXIteSArPSBzb3VuZC5oCi1o ZWFkZXIteSArPSBzdGF0LmgKLWhlYWRlci15ICs9IHN0ZGRlZi5oCi1oZWFkZXIteSArPSBzdHJp bmcuaAotaGVhZGVyLXkgKz0gc3VzcGVuZF9pb2N0bHMuaAotaGVhZGVyLXkgKz0gc3dhYi5oCi1o ZWFkZXIteSArPSBzeW5jbGluay5oCi1oZWFkZXIteSArPSBzeW5jX2ZpbGUuaAotaGVhZGVyLXkg Kz0gc3lzY3RsLmgKLWhlYWRlci15ICs9IHN5c2luZm8uaAotaGVhZGVyLXkgKz0gdGFyZ2V0X2Nv cmVfdXNlci5oCi1oZWFkZXIteSArPSB0YXNrc3RhdHMuaAotaGVhZGVyLXkgKz0gdGNwLmgKLWhl YWRlci15ICs9IHRjcF9tZXRyaWNzLmgKLWhlYWRlci15ICs9IHRlbGVwaG9ueS5oCi1oZWFkZXIt eSArPSB0ZXJtaW9zLmgKLWhlYWRlci15ICs9IHRoZXJtYWwuaAotaGVhZGVyLXkgKz0gdGltZS5o Ci1oZWFkZXIteSArPSB0aW1lcmZkLmgKLWhlYWRlci15ICs9IHRpbWVzLmgKLWhlYWRlci15ICs9 IHRpbWV4LmgKLWhlYWRlci15ICs9IHRpb2NsLmgKLWhlYWRlci15ICs9IHRpcGNfY29uZmlnLmgK LWhlYWRlci15ICs9IHRpcGNfbmV0bGluay5oCi1oZWFkZXIteSArPSB0aXBjLmgKLWhlYWRlci15 ICs9IHRvc2hpYmEuaAotaGVhZGVyLXkgKz0gdHR5X2ZsYWdzLmgKLWhlYWRlci15ICs9IHR0eS5o Ci1oZWFkZXIteSArPSB0eXBlcy5oCi1oZWFkZXIteSArPSB1ZGZfZnNfaS5oCi1oZWFkZXIteSAr PSB1ZHAuaAotaGVhZGVyLXkgKz0gdWhpZC5oCi1oZWFkZXIteSArPSB1aW5wdXQuaAotaGVhZGVy LXkgKz0gdWlvLmgKLWhlYWRlci15ICs9IHVsZWRzLmgKLWhlYWRlci15ICs9IHVsdHJhc291bmQu aAotaGVhZGVyLXkgKz0gdW4uaAotaGVhZGVyLXkgKz0gdW5pc3RkLmgKLWhlYWRlci15ICs9IHVu aXhfZGlhZy5oCi1oZWFkZXIteSArPSB1c2JkZXZpY2VfZnMuaAotaGVhZGVyLXkgKz0gdXNiaXAu aAotaGVhZGVyLXkgKz0gdXRpbWUuaAotaGVhZGVyLXkgKz0gdXRzbmFtZS5oCi1oZWFkZXIteSAr PSB1dWlkLmgKLWhlYWRlci15ICs9IHV2Y3ZpZGVvLmgKLWhlYWRlci15ICs9IHY0bDItY29tbW9u LmgKLWhlYWRlci15ICs9IHY0bDItY29udHJvbHMuaAotaGVhZGVyLXkgKz0gdjRsMi1kdi10aW1p bmdzLmgKLWhlYWRlci15ICs9IHY0bDItbWVkaWFidXMuaAotaGVhZGVyLXkgKz0gdjRsMi1zdWJk ZXYuaAotaGVhZGVyLXkgKz0gdmV0aC5oCi1oZWFkZXIteSArPSB2ZmlvLmgKLWhlYWRlci15ICs9 IHZob3N0LmgKLWhlYWRlci15ICs9IHZpZGVvZGV2Mi5oCi1oZWFkZXIteSArPSB2aXJ0aW9fOXAu aAotaGVhZGVyLXkgKz0gdmlydGlvX2JhbGxvb24uaAotaGVhZGVyLXkgKz0gdmlydGlvX2Jsay5o Ci1oZWFkZXIteSArPSB2aXJ0aW9fY29uZmlnLmgKLWhlYWRlci15ICs9IHZpcnRpb19jb25zb2xl LmgKLWhlYWRlci15ICs9IHZpcnRpb19ncHUuaAotaGVhZGVyLXkgKz0gdmlydGlvX2lkcy5oCi1o ZWFkZXIteSArPSB2aXJ0aW9faW5wdXQuaAotaGVhZGVyLXkgKz0gdmlydGlvX25ldC5oCi1oZWFk ZXIteSArPSB2aXJ0aW9fcGNpLmgKLWhlYWRlci15ICs9IHZpcnRpb19yaW5nLmgKLWhlYWRlci15 ICs9IHZpcnRpb19ybmcuaAotaGVhZGVyLXkgKz0gdmlydGlvX3Njc2kuaAotaGVhZGVyLXkgKz0g dmlydGlvX3R5cGVzLmgKLWhlYWRlci15ICs9IHZpcnRpb192c29jay5oCi1oZWFkZXIteSArPSB2 aXJ0aW9fY3J5cHRvLmgKLWhlYWRlci15ICs9IHZtX3NvY2tldHMuaAotaGVhZGVyLXkgKz0gdnQu aAotaGVhZGVyLXkgKz0gdnRwbV9wcm94eS5oCi1oZWFkZXIteSArPSB3YWl0LmgKLWhlYWRlci15 ICs9IHdhbnJvdXRlci5oCi1oZWFkZXIteSArPSB3YXRjaGRvZy5oCi1oZWFkZXIteSArPSB3aW1h eC5oCi1oZWFkZXIteSArPSB3aXJlbGVzcy5oCi1oZWFkZXIteSArPSB4MjUuaAotaGVhZGVyLXkg Kz0geGF0dHIuaAotaGVhZGVyLXkgKz0geGZybS5oCi1oZWFkZXIteSArPSB4aWxpbngtdjRsMi1j b250cm9scy5oCi1oZWFkZXIteSArPSB6b3Jyby5oCi1oZWFkZXIteSArPSB6b3Jyb19pZHMuaAot aGVhZGVyLXkgKz0gdXNlcmZhdWx0ZmQuaApkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2xpbnV4 L2FuZHJvaWQvS2J1aWxkIGIvaW5jbHVkZS91YXBpL2xpbnV4L2FuZHJvaWQvS2J1aWxkCmRlbGV0 ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBjYTAxMWVlYzI1MmEuLjAwMDAwMDAwMDAwMAotLS0g YS9pbmNsdWRlL3VhcGkvbGludXgvYW5kcm9pZC9LYnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSwy ICswLDAgQEAKLSMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IGJpbmRlci5o CmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvbGludXgvYnl0ZW9yZGVyL0tidWlsZCBiL2luY2x1 ZGUvdWFwaS9saW51eC9ieXRlb3JkZXIvS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NApp bmRleCA2MTkyMjViOWZmMmUuLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL3VhcGkvbGludXgv Ynl0ZW9yZGVyL0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDMgKzAsMCBAQAotIyBVQVBJIEhl YWRlciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gYmlnX2VuZGlhbi5oCi1oZWFkZXIteSArPSBs aXR0bGVfZW5kaWFuLmgKZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9saW51eC9jYWlmL0tidWls ZCBiL2luY2x1ZGUvdWFwaS9saW51eC9jYWlmL0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggNDMzOTY2MTJkM2EzLi4wMDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS91YXBpL2xp bnV4L2NhaWYvS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsMyArMCwwIEBACi0jIFVBUEkgSGVh ZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBjYWlmX3NvY2tldC5oCi1oZWFkZXIteSArPSBp Zl9jYWlmLmgKZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9saW51eC9jYW4vS2J1aWxkIGIvaW5j bHVkZS91YXBpL2xpbnV4L2Nhbi9LYnVpbGQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDIxYzkxYmYyNWEyOS4uMDAwMDAwMDAwMDAwCi0tLSBhL2luY2x1ZGUvdWFwaS9saW51eC9jYW4v S2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsNiArMCwwIEBACi0jIFVBUEkgSGVhZGVyIGV4cG9y dCBsaXN0Ci1oZWFkZXIteSArPSBiY20uaAotaGVhZGVyLXkgKz0gZXJyb3IuaAotaGVhZGVyLXkg Kz0gZ3cuaAotaGVhZGVyLXkgKz0gbmV0bGluay5oCi1oZWFkZXIteSArPSByYXcuaApkaWZmIC0t Z2l0IGEvaW5jbHVkZS91YXBpL2xpbnV4L2R2Yi9LYnVpbGQgYi9pbmNsdWRlL3VhcGkvbGludXgv ZHZiL0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZDQwOTQyY2ZjNjI3Li4w MDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS91YXBpL2xpbnV4L2R2Yi9LYnVpbGQKKysrIC9kZXYv bnVsbApAQCAtMSw5ICswLDAgQEAKLSMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15 ICs9IGF1ZGlvLmgKLWhlYWRlci15ICs9IGNhLmgKLWhlYWRlci15ICs9IGRteC5oCi1oZWFkZXIt eSArPSBmcm9udGVuZC5oCi1oZWFkZXIteSArPSBuZXQuaAotaGVhZGVyLXkgKz0gb3NkLmgKLWhl YWRlci15ICs9IHZlcnNpb24uaAotaGVhZGVyLXkgKz0gdmlkZW8uaApkaWZmIC0tZ2l0IGEvaW5j bHVkZS91YXBpL2xpbnV4L2hkbGMvS2J1aWxkIGIvaW5jbHVkZS91YXBpL2xpbnV4L2hkbGMvS2J1 aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA4YzFkMmNiNzVlMzMuLjAwMDAwMDAw MDAwMAotLS0gYS9pbmNsdWRlL3VhcGkvbGludXgvaGRsYy9LYnVpbGQKKysrIC9kZXYvbnVsbApA QCAtMSwyICswLDAgQEAKLSMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IGlv Y3RsLmgKZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9saW51eC9oc2kvS2J1aWxkIGIvaW5jbHVk ZS91YXBpL2xpbnV4L2hzaS9LYnVpbGQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGEx NmEwMDU0NDI1OC4uMDAwMDAwMDAwMDAwCi0tLSBhL2luY2x1ZGUvdWFwaS9saW51eC9oc2kvS2J1 aWxkCisrKyAvZGV2L251bGwKQEAgLTEsMiArMCwwIEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBs aXN0Ci1oZWFkZXIteSArPSBoc2lfY2hhci5oIGNzLXByb3RvY29sLmgKZGlmZiAtLWdpdCBhL2lu Y2x1ZGUvdWFwaS9saW51eC9paW8vS2J1aWxkIGIvaW5jbHVkZS91YXBpL2xpbnV4L2lpby9LYnVp bGQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDg2Zjc2ZDg0YzQ0Zi4uMDAwMDAwMDAw MDAwCi0tLSBhL2luY2x1ZGUvdWFwaS9saW51eC9paW8vS2J1aWxkCisrKyAvZGV2L251bGwKQEAg LTEsMyArMCwwIEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBldmVu dHMuaAotaGVhZGVyLXkgKz0gdHlwZXMuaApkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2xpbnV4 L2lzZG4vS2J1aWxkIGIvaW5jbHVkZS91YXBpL2xpbnV4L2lzZG4vS2J1aWxkCmRlbGV0ZWQgZmls ZSBtb2RlIDEwMDY0NAppbmRleCA4OWU1Mjg1MGJmMjkuLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNs dWRlL3VhcGkvbGludXgvaXNkbi9LYnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSwyICswLDAgQEAK LSMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IGNhcGljbWQuaApkaWZmIC0t Z2l0IGEvaW5jbHVkZS91YXBpL2xpbnV4L21tYy9LYnVpbGQgYi9pbmNsdWRlL3VhcGkvbGludXgv bW1jL0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggOGMxZDJjYjc1ZTMzLi4w MDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS91YXBpL2xpbnV4L21tYy9LYnVpbGQKKysrIC9kZXYv bnVsbApAQCAtMSwyICswLDAgQEAKLSMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15 ICs9IGlvY3RsLmgKZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9saW51eC9uZXRmaWx0ZXIvS2J1 aWxkIGIvaW5jbHVkZS91YXBpL2xpbnV4L25ldGZpbHRlci9LYnVpbGQKZGVsZXRlZCBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAzZjE5NGFlYWRjNS4uMDAwMDAwMDAwMDAwCi0tLSBhL2luY2x1ZGUv dWFwaS9saW51eC9uZXRmaWx0ZXIvS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsODkgKzAsMCBA QAotIyBVQVBJIEhlYWRlciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gaXBzZXQvCi1oZWFkZXIt eSArPSBuZl9jb25udHJhY2tfY29tbW9uLmgKLWhlYWRlci15ICs9IG5mX2Nvbm50cmFja19mdHAu aAotaGVhZGVyLXkgKz0gbmZfY29ubnRyYWNrX3NjdHAuaAotaGVhZGVyLXkgKz0gbmZfY29ubnRy YWNrX3RjcC5oCi1oZWFkZXIteSArPSBuZl9jb25udHJhY2tfdHVwbGVfY29tbW9uLmgKLWhlYWRl ci15ICs9IG5mX2xvZy5oCi1oZWFkZXIteSArPSBuZl90YWJsZXMuaAotaGVhZGVyLXkgKz0gbmZf dGFibGVzX2NvbXBhdC5oCi1oZWFkZXIteSArPSBuZl9uYXQuaAotaGVhZGVyLXkgKz0gbmZuZXRs aW5rLmgKLWhlYWRlci15ICs9IG5mbmV0bGlua19hY2N0LmgKLWhlYWRlci15ICs9IG5mbmV0bGlu a19jb21wYXQuaAotaGVhZGVyLXkgKz0gbmZuZXRsaW5rX2Nvbm50cmFjay5oCi1oZWFkZXIteSAr PSBuZm5ldGxpbmtfY3RoZWxwZXIuaAotaGVhZGVyLXkgKz0gbmZuZXRsaW5rX2N0dGltZW91dC5o Ci1oZWFkZXIteSArPSBuZm5ldGxpbmtfbG9nLmgKLWhlYWRlci15ICs9IG5mbmV0bGlua19xdWV1 ZS5oCi1oZWFkZXIteSArPSB4X3RhYmxlcy5oCi1oZWFkZXIteSArPSB4dF9BVURJVC5oCi1oZWFk ZXIteSArPSB4dF9DSEVDS1NVTS5oCi1oZWFkZXIteSArPSB4dF9DTEFTU0lGWS5oCi1oZWFkZXIt eSArPSB4dF9DT05OTUFSSy5oCi1oZWFkZXIteSArPSB4dF9DT05OU0VDTUFSSy5oCi1oZWFkZXIt eSArPSB4dF9DVC5oCi1oZWFkZXIteSArPSB4dF9EU0NQLmgKLWhlYWRlci15ICs9IHh0X0hNQVJL LmgKLWhlYWRlci15ICs9IHh0X0lETEVUSU1FUi5oCi1oZWFkZXIteSArPSB4dF9MRUQuaAotaGVh ZGVyLXkgKz0geHRfTE9HLmgKLWhlYWRlci15ICs9IHh0X01BUksuaAotaGVhZGVyLXkgKz0geHRf TkZMT0cuaAotaGVhZGVyLXkgKz0geHRfTkZRVUVVRS5oCi1oZWFkZXIteSArPSB4dF9SQVRFRVNU LmgKLWhlYWRlci15ICs9IHh0X1NFQ01BUksuaAotaGVhZGVyLXkgKz0geHRfU1lOUFJPWFkuaAot aGVhZGVyLXkgKz0geHRfVENQTVNTLmgKLWhlYWRlci15ICs9IHh0X1RDUE9QVFNUUklQLmgKLWhl YWRlci15ICs9IHh0X1RFRS5oCi1oZWFkZXIteSArPSB4dF9UUFJPWFkuaAotaGVhZGVyLXkgKz0g eHRfYWRkcnR5cGUuaAotaGVhZGVyLXkgKz0geHRfYnBmLmgKLWhlYWRlci15ICs9IHh0X2Nncm91 cC5oCi1oZWFkZXIteSArPSB4dF9jbHVzdGVyLmgKLWhlYWRlci15ICs9IHh0X2NvbW1lbnQuaAot aGVhZGVyLXkgKz0geHRfY29ubmJ5dGVzLmgKLWhlYWRlci15ICs9IHh0X2Nvbm5sYWJlbC5oCi1o ZWFkZXIteSArPSB4dF9jb25ubGltaXQuaAotaGVhZGVyLXkgKz0geHRfY29ubm1hcmsuaAotaGVh ZGVyLXkgKz0geHRfY29ubnRyYWNrLmgKLWhlYWRlci15ICs9IHh0X2NwdS5oCi1oZWFkZXIteSAr PSB4dF9kY2NwLmgKLWhlYWRlci15ICs9IHh0X2Rldmdyb3VwLmgKLWhlYWRlci15ICs9IHh0X2Rz Y3AuaAotaGVhZGVyLXkgKz0geHRfZWNuLmgKLWhlYWRlci15ICs9IHh0X2VzcC5oCi1oZWFkZXIt eSArPSB4dF9oYXNobGltaXQuaAotaGVhZGVyLXkgKz0geHRfaGVscGVyLmgKLWhlYWRlci15ICs9 IHh0X2lwY29tcC5oCi1oZWFkZXIteSArPSB4dF9pcHJhbmdlLmgKLWhlYWRlci15ICs9IHh0X2lw dnMuaAotaGVhZGVyLXkgKz0geHRfbDJ0cC5oCi1oZWFkZXIteSArPSB4dF9sZW5ndGguaAotaGVh ZGVyLXkgKz0geHRfbGltaXQuaAotaGVhZGVyLXkgKz0geHRfbWFjLmgKLWhlYWRlci15ICs9IHh0 X21hcmsuaAotaGVhZGVyLXkgKz0geHRfbXVsdGlwb3J0LmgKLWhlYWRlci15ICs9IHh0X25mYWNj dC5oCi1oZWFkZXIteSArPSB4dF9vc2YuaAotaGVhZGVyLXkgKz0geHRfb3duZXIuaAotaGVhZGVy LXkgKz0geHRfcGh5c2Rldi5oCi1oZWFkZXIteSArPSB4dF9wa3R0eXBlLmgKLWhlYWRlci15ICs9 IHh0X3BvbGljeS5oCi1oZWFkZXIteSArPSB4dF9xdW90YS5oCi1oZWFkZXIteSArPSB4dF9yYXRl ZXN0LmgKLWhlYWRlci15ICs9IHh0X3JlYWxtLmgKLWhlYWRlci15ICs9IHh0X3JlY2VudC5oCi1o ZWFkZXIteSArPSB4dF9ycGZpbHRlci5oCi1oZWFkZXIteSArPSB4dF9zY3RwLmgKLWhlYWRlci15 ICs9IHh0X3NldC5oCi1oZWFkZXIteSArPSB4dF9zb2NrZXQuaAotaGVhZGVyLXkgKz0geHRfc3Rh dGUuaAotaGVhZGVyLXkgKz0geHRfc3RhdGlzdGljLmgKLWhlYWRlci15ICs9IHh0X3N0cmluZy5o Ci1oZWFkZXIteSArPSB4dF90Y3Btc3MuaAotaGVhZGVyLXkgKz0geHRfdGNwdWRwLmgKLWhlYWRl ci15ICs9IHh0X3RpbWUuaAotaGVhZGVyLXkgKz0geHRfdTMyLmgKZGlmZiAtLWdpdCBhL2luY2x1 ZGUvdWFwaS9saW51eC9uZXRmaWx0ZXIvaXBzZXQvS2J1aWxkIGIvaW5jbHVkZS91YXBpL2xpbnV4 L25ldGZpbHRlci9pcHNldC9LYnVpbGQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGQy NjgwNDIzZDlhYi4uMDAwMDAwMDAwMDAwCi0tLSBhL2luY2x1ZGUvdWFwaS9saW51eC9uZXRmaWx0 ZXIvaXBzZXQvS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsNSArMCwwIEBACi0jIFVBUEkgSGVh ZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBpcF9zZXQuaAotaGVhZGVyLXkgKz0gaXBfc2V0 X2JpdG1hcC5oCi1oZWFkZXIteSArPSBpcF9zZXRfaGFzaC5oCi1oZWFkZXIteSArPSBpcF9zZXRf bGlzdC5oCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvbGludXgvbmV0ZmlsdGVyX2FycC9LYnVp bGQgYi9pbmNsdWRlL3VhcGkvbGludXgvbmV0ZmlsdGVyX2FycC9LYnVpbGQKZGVsZXRlZCBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDYyZDU2MzdjYzBhYy4uMDAwMDAwMDAwMDAwCi0tLSBhL2luY2x1 ZGUvdWFwaS9saW51eC9uZXRmaWx0ZXJfYXJwL0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDMg KzAsMCBAQAotIyBVQVBJIEhlYWRlciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gYXJwX3RhYmxl cy5oCi1oZWFkZXIteSArPSBhcnB0X21hbmdsZS5oCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkv bGludXgvbmV0ZmlsdGVyX2JyaWRnZS9LYnVpbGQgYi9pbmNsdWRlL3VhcGkvbGludXgvbmV0Zmls dGVyX2JyaWRnZS9LYnVpbGQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDBmYmFkOGVm OTZkZS4uMDAwMDAwMDAwMDAwCi0tLSBhL2luY2x1ZGUvdWFwaS9saW51eC9uZXRmaWx0ZXJfYnJp ZGdlL0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDE4ICswLDAgQEAKLSMgVUFQSSBIZWFkZXIg ZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IGVidF84MDJfMy5oCi1oZWFkZXIteSArPSBlYnRfYW1v bmcuaAotaGVhZGVyLXkgKz0gZWJ0X2FycC5oCi1oZWFkZXIteSArPSBlYnRfYXJwcmVwbHkuaAot aGVhZGVyLXkgKz0gZWJ0X2lwLmgKLWhlYWRlci15ICs9IGVidF9pcDYuaAotaGVhZGVyLXkgKz0g ZWJ0X2xpbWl0LmgKLWhlYWRlci15ICs9IGVidF9sb2cuaAotaGVhZGVyLXkgKz0gZWJ0X21hcmtf bS5oCi1oZWFkZXIteSArPSBlYnRfbWFya190LmgKLWhlYWRlci15ICs9IGVidF9uYXQuaAotaGVh ZGVyLXkgKz0gZWJ0X25mbG9nLmgKLWhlYWRlci15ICs9IGVidF9wa3R0eXBlLmgKLWhlYWRlci15 ICs9IGVidF9yZWRpcmVjdC5oCi1oZWFkZXIteSArPSBlYnRfc3RwLmgKLWhlYWRlci15ICs9IGVi dF92bGFuLmgKLWhlYWRlci15ICs9IGVidGFibGVzLmgKZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFw aS9saW51eC9uZXRmaWx0ZXJfaXB2NC9LYnVpbGQgYi9pbmNsdWRlL3VhcGkvbGludXgvbmV0Zmls dGVyX2lwdjQvS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBlY2IyOTFkZjM5 MGUuLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL3VhcGkvbGludXgvbmV0ZmlsdGVyX2lwdjQv S2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsMTAgKzAsMCBAQAotIyBVQVBJIEhlYWRlciBleHBv cnQgbGlzdAotaGVhZGVyLXkgKz0gaXBfdGFibGVzLmgKLWhlYWRlci15ICs9IGlwdF9DTFVTVEVS SVAuaAotaGVhZGVyLXkgKz0gaXB0X0VDTi5oCi1oZWFkZXIteSArPSBpcHRfTE9HLmgKLWhlYWRl ci15ICs9IGlwdF9SRUpFQ1QuaAotaGVhZGVyLXkgKz0gaXB0X1RUTC5oCi1oZWFkZXIteSArPSBp cHRfYWguaAotaGVhZGVyLXkgKz0gaXB0X2Vjbi5oCi1oZWFkZXIteSArPSBpcHRfdHRsLmgKZGlm ZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9saW51eC9uZXRmaWx0ZXJfaXB2Ni9LYnVpbGQgYi9pbmNs dWRlL3VhcGkvbGludXgvbmV0ZmlsdGVyX2lwdjYvS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEw MDY0NAppbmRleCA3NWE2NjhjYTIzNTMuLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL3VhcGkv bGludXgvbmV0ZmlsdGVyX2lwdjYvS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsMTMgKzAsMCBA QAotIyBVQVBJIEhlYWRlciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gaXA2X3RhYmxlcy5oCi1o ZWFkZXIteSArPSBpcDZ0X0hMLmgKLWhlYWRlci15ICs9IGlwNnRfTE9HLmgKLWhlYWRlci15ICs9 IGlwNnRfTlBULmgKLWhlYWRlci15ICs9IGlwNnRfUkVKRUNULmgKLWhlYWRlci15ICs9IGlwNnRf YWguaAotaGVhZGVyLXkgKz0gaXA2dF9mcmFnLmgKLWhlYWRlci15ICs9IGlwNnRfaGwuaAotaGVh ZGVyLXkgKz0gaXA2dF9pcHY2aGVhZGVyLmgKLWhlYWRlci15ICs9IGlwNnRfbWguaAotaGVhZGVy LXkgKz0gaXA2dF9vcHRzLmgKLWhlYWRlci15ICs9IGlwNnRfcnQuaApkaWZmIC0tZ2l0IGEvaW5j bHVkZS91YXBpL2xpbnV4L25mc2QvS2J1aWxkIGIvaW5jbHVkZS91YXBpL2xpbnV4L25mc2QvS2J1 aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBjMTFiYzQwNDA1M2MuLjAwMDAwMDAw MDAwMAotLS0gYS9pbmNsdWRlL3VhcGkvbGludXgvbmZzZC9LYnVpbGQKKysrIC9kZXYvbnVsbApA QCAtMSw2ICswLDAgQEAKLSMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IGNs ZC5oCi1oZWFkZXIteSArPSBkZWJ1Zy5oCi1oZWFkZXIteSArPSBleHBvcnQuaAotaGVhZGVyLXkg Kz0gbmZzZmguaAotaGVhZGVyLXkgKz0gc3RhdHMuaApkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBp L2xpbnV4L3JhaWQvS2J1aWxkIGIvaW5jbHVkZS91YXBpL2xpbnV4L3JhaWQvS2J1aWxkCmRlbGV0 ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBlMmMzZDI1NDA1ZDcuLjAwMDAwMDAwMDAwMAotLS0g YS9pbmNsdWRlL3VhcGkvbGludXgvcmFpZC9LYnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSwzICsw LDAgQEAKLSMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IG1kX3AuaAotaGVh ZGVyLXkgKz0gbWRfdS5oCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvbGludXgvc3BpL0tidWls ZCBiL2luY2x1ZGUvdWFwaS9saW51eC9zcGkvS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwY2M3NDdlZmYxNjUuLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL3VhcGkvbGlu dXgvc3BpL0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDIgKzAsMCBAQAotIyBVQVBJIEhlYWRl ciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gc3BpZGV2LmgKZGlmZiAtLWdpdCBhL2luY2x1ZGUv dWFwaS9saW51eC9zdW5ycGMvS2J1aWxkIGIvaW5jbHVkZS91YXBpL2xpbnV4L3N1bnJwYy9LYnVp bGQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDhlMDJlNDdjMjBmYi4uMDAwMDAwMDAw MDAwCi0tLSBhL2luY2x1ZGUvdWFwaS9saW51eC9zdW5ycGMvS2J1aWxkCisrKyAvZGV2L251bGwK QEAgLTEsMiArMCwwIEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBk ZWJ1Zy5oCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvbGludXgvdGNfYWN0L0tidWlsZCBiL2lu Y2x1ZGUvdWFwaS9saW51eC90Y19hY3QvS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NApp bmRleCBlM2RiNzQwMzI5NmYuLjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL3VhcGkvbGludXgv dGNfYWN0L0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDE1ICswLDAgQEAKLSMgVUFQSSBIZWFk ZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IHRjX2NzdW0uaAotaGVhZGVyLXkgKz0gdGNfZGVm YWN0LmgKLWhlYWRlci15ICs9IHRjX2dhY3QuaAotaGVhZGVyLXkgKz0gdGNfaXB0LmgKLWhlYWRl ci15ICs9IHRjX21pcnJlZC5oCi1oZWFkZXIteSArPSB0Y19uYXQuaAotaGVhZGVyLXkgKz0gdGNf cGVkaXQuaAotaGVhZGVyLXkgKz0gdGNfc2tiZWRpdC5oCi1oZWFkZXIteSArPSB0Y192bGFuLmgK LWhlYWRlci15ICs9IHRjX2JwZi5oCi1oZWFkZXIteSArPSB0Y19jb25ubWFyay5oCi1oZWFkZXIt eSArPSB0Y19pZmUuaAotaGVhZGVyLXkgKz0gdGNfdHVubmVsX2tleS5oCi1oZWFkZXIteSArPSB0 Y19za2Jtb2QuaApkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2xpbnV4L3RjX2VtYXRjaC9LYnVp bGQgYi9pbmNsdWRlL3VhcGkvbGludXgvdGNfZW1hdGNoL0tidWlsZApkZWxldGVkIGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggNTNmY2EzOTI1NTM1Li4wMDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS91 YXBpL2xpbnV4L3RjX2VtYXRjaC9LYnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSw1ICswLDAgQEAK LSMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IHRjX2VtX2NtcC5oCi1oZWFk ZXIteSArPSB0Y19lbV9tZXRhLmgKLWhlYWRlci15ICs9IHRjX2VtX25ieXRlLmgKLWhlYWRlci15 ICs9IHRjX2VtX3RleHQuaApkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2xpbnV4L3VzYi9LYnVp bGQgYi9pbmNsdWRlL3VhcGkvbGludXgvdXNiL0tidWlsZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggNGNjNGQ2ZTdlNTIzLi4wMDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS91YXBpL2xp bnV4L3VzYi9LYnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSwxMiArMCwwIEBACi0jIFVBUEkgSGVh ZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBhdWRpby5oCi1oZWFkZXIteSArPSBjZGMuaAot aGVhZGVyLXkgKz0gY2RjLXdkbS5oCi1oZWFkZXIteSArPSBjaDExLmgKLWhlYWRlci15ICs9IGNo OS5oCi1oZWFkZXIteSArPSBmdW5jdGlvbmZzLmgKLWhlYWRlci15ICs9IGdfcHJpbnRlci5oCi1o ZWFkZXIteSArPSBnYWRnZXRmcy5oCi1oZWFkZXIteSArPSBtaWRpLmgKLWhlYWRlci15ICs9IHRt Yy5oCi1oZWFkZXIteSArPSB2aWRlby5oCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvbGludXgv d2ltYXgvS2J1aWxkIGIvaW5jbHVkZS91YXBpL2xpbnV4L3dpbWF4L0tidWlsZApkZWxldGVkIGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMWM5N2JlNDk5NzFmLi4wMDAwMDAwMDAwMDAKLS0tIGEvaW5j bHVkZS91YXBpL2xpbnV4L3dpbWF4L0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDIgKzAsMCBA QAotIyBVQVBJIEhlYWRlciBleHBvcnQgbGlzdAotaGVhZGVyLXkgKz0gaTI0MDBtLmgKZGlmZiAt LWdpdCBhL2luY2x1ZGUvdWFwaS9taXNjL0tidWlsZCBiL2luY2x1ZGUvdWFwaS9taXNjL0tidWls ZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZTk2Y2FlN2Q1OGM5Li4wMDAwMDAwMDAw MDAKLS0tIGEvaW5jbHVkZS91YXBpL21pc2MvS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsMiAr MCwwIEBACi0jIG1pc2MgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBjeGwuaApkaWZm IC0tZ2l0IGEvaW5jbHVkZS91YXBpL210ZC9LYnVpbGQgYi9pbmNsdWRlL3VhcGkvbXRkL0tidWls ZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNWE2OTFlMTBjZDBlLi4wMDAwMDAwMDAw MDAKLS0tIGEvaW5jbHVkZS91YXBpL210ZC9LYnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSw2ICsw LDAgQEAKLSMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IGluZnRsLXVzZXIu aAotaGVhZGVyLXkgKz0gbXRkLWFiaS5oCi1oZWFkZXIteSArPSBtdGQtdXNlci5oCi1oZWFkZXIt eSArPSBuZnRsLXVzZXIuaAotaGVhZGVyLXkgKz0gdWJpLXVzZXIuaApkaWZmIC0tZ2l0IGEvaW5j bHVkZS91YXBpL3JkbWEvS2J1aWxkIGIvaW5jbHVkZS91YXBpL3JkbWEvS2J1aWxkCmRlbGV0ZWQg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCA4MmJkZjU2MjY4NTkuLjAwMDAwMDAwMDAwMAotLS0gYS9p bmNsdWRlL3VhcGkvcmRtYS9LYnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSwxOCArMCwwIEBACi0j IFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBpYl91c2VyX2NtLmgKLWhlYWRl ci15ICs9IGliX3VzZXJfbWFkLmgKLWhlYWRlci15ICs9IGliX3VzZXJfc2EuaAotaGVhZGVyLXkg Kz0gaWJfdXNlcl92ZXJicy5oCi1oZWFkZXIteSArPSByZG1hX25ldGxpbmsuaAotaGVhZGVyLXkg Kz0gcmRtYV91c2VyX2NtLmgKLWhlYWRlci15ICs9IGhmaS8KLWhlYWRlci15ICs9IHJkbWFfdXNl cl9yeGUuaAotaGVhZGVyLXkgKz0gY3hnYjMtYWJpLmgKLWhlYWRlci15ICs9IGN4Z2I0LWFiaS5o Ci1oZWFkZXIteSArPSBtbHg0LWFiaS5oCi1oZWFkZXIteSArPSBtbHg1LWFiaS5oCi1oZWFkZXIt eSArPSBtdGhjYS1hYmkuaAotaGVhZGVyLXkgKz0gbmVzLWFiaS5oCi1oZWFkZXIteSArPSBvY3Jk bWEtYWJpLmgKLWhlYWRlci15ICs9IGhucy1hYmkuaAotaGVhZGVyLXkgKz0gdm13X3B2cmRtYS1h YmkuaApkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL3JkbWEvaGZpL0tidWlsZCBiL2luY2x1ZGUv dWFwaS9yZG1hL2hmaS9LYnVpbGQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGVmMjNj Mjk0ZmM3MS4uMDAwMDAwMDAwMDAwCi0tLSBhL2luY2x1ZGUvdWFwaS9yZG1hL2hmaS9LYnVpbGQK KysrIC9kZXYvbnVsbApAQCAtMSwyICswLDAgQEAKLSMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QK LWhlYWRlci15ICs9IGhmaTFfdXNlci5oCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvc2NzaS9L YnVpbGQgYi9pbmNsdWRlL3VhcGkvc2NzaS9LYnVpbGQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IGQ3OTFlMGFkNTA5ZC4uMDAwMDAwMDAwMDAwCi0tLSBhL2luY2x1ZGUvdWFwaS9zY3Np L0tidWlsZAorKysgL2Rldi9udWxsCkBAIC0xLDYgKzAsMCBAQAotIyBVQVBJIEhlYWRlciBleHBv cnQgbGlzdAotaGVhZGVyLXkgKz0gZmMvCi1oZWFkZXIteSArPSBzY3NpX2JzZ19mYy5oCi1oZWFk ZXIteSArPSBzY3NpX25ldGxpbmsuaAotaGVhZGVyLXkgKz0gc2NzaV9uZXRsaW5rX2ZjLmgKLWhl YWRlci15ICs9IGN4bGZsYXNoX2lvY3RsLmgKZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9zY3Np L2ZjL0tidWlsZCBiL2luY2x1ZGUvdWFwaS9zY3NpL2ZjL0tidWlsZApkZWxldGVkIGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggNWVhZDlmYWMyNjVjLi4wMDAwMDAwMDAwMDAKLS0tIGEvaW5jbHVkZS91 YXBpL3Njc2kvZmMvS2J1aWxkCisrKyAvZGV2L251bGwKQEAgLTEsNSArMCwwIEBACi0jIFVBUEkg SGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBmY19lbHMuaAotaGVhZGVyLXkgKz0gZmNf ZnMuaAotaGVhZGVyLXkgKz0gZmNfZ3MuaAotaGVhZGVyLXkgKz0gZmNfbnMuaApkaWZmIC0tZ2l0 IGEvaW5jbHVkZS91YXBpL3NvdW5kL0tidWlsZCBiL2luY2x1ZGUvdWFwaS9zb3VuZC9LYnVpbGQK ZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDk1NzhkOGJkYmYzMS4uMDAwMDAwMDAwMDAw Ci0tLSBhL2luY2x1ZGUvdWFwaS9zb3VuZC9LYnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSwxNiAr MCwwIEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSArPSBhc2VxdWVuY2Vy LmgKLWhlYWRlci15ICs9IGFzb2MuaAotaGVhZGVyLXkgKz0gYXNvdW5kLmgKLWhlYWRlci15ICs9 IGFzb3VuZF9mbS5oCi1oZWFkZXIteSArPSBjb21wcmVzc19vZmZsb2FkLmgKLWhlYWRlci15ICs9 IGNvbXByZXNzX3BhcmFtcy5oCi1oZWFkZXIteSArPSBlbXUxMGsxLmgKLWhlYWRlci15ICs9IGZp cmV3aXJlLmgKLWhlYWRlci15ICs9IGhkc3AuaAotaGVhZGVyLXkgKz0gaGRzcG0uaAotaGVhZGVy LXkgKz0gc2IxNl9jc3AuaAotaGVhZGVyLXkgKz0gc2ZudF9pbmZvLmgKLWhlYWRlci15ICs9IHRs di5oCi1oZWFkZXIteSArPSB1c2Jfc3RyZWFtLmgKLWhlYWRlci15ICs9IHNuZF9zc3RfdG9rZW5z LmgKZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS92aWRlby9LYnVpbGQgYi9pbmNsdWRlL3VhcGkv dmlkZW8vS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBhYzcyMDNiYjMyY2Mu LjAwMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL3VhcGkvdmlkZW8vS2J1aWxkCisrKyAvZGV2L251 bGwKQEAgLTEsNCArMCwwIEBACi0jIFVBUEkgSGVhZGVyIGV4cG9ydCBsaXN0Ci1oZWFkZXIteSAr PSBlZGlkLmgKLWhlYWRlci15ICs9IHNpc2ZiLmgKLWhlYWRlci15ICs9IHV2ZXNhZmIuaApkaWZm IC0tZ2l0IGEvaW5jbHVkZS91YXBpL3hlbi9LYnVpbGQgYi9pbmNsdWRlL3VhcGkveGVuL0tidWls ZApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNWM0NTk2MjhlOGM3Li4wMDAwMDAwMDAw MDAKLS0tIGEvaW5jbHVkZS91YXBpL3hlbi9LYnVpbGQKKysrIC9kZXYvbnVsbApAQCAtMSw1ICsw LDAgQEAKLSMgVUFQSSBIZWFkZXIgZXhwb3J0IGxpc3QKLWhlYWRlci15ICs9IGV2dGNobi5oCi1o ZWFkZXIteSArPSBnbnRhbGxvYy5oCi1oZWFkZXIteSArPSBnbnRkZXYuaAotaGVhZGVyLXkgKz0g cHJpdmNtZC5oCmRpZmYgLS1naXQgYS9pbmNsdWRlL3ZpZGVvL0tidWlsZCBiL2luY2x1ZGUvdmlk ZW8vS2J1aWxkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBlNjlkZTI5YmIyZDEuLjAw MDAwMDAwMDAwMApkaWZmIC0tZ2l0IGEvc2NyaXB0cy9NYWtlZmlsZS5oZWFkZXJzaW5zdCBiL3Nj cmlwdHMvTWFrZWZpbGUuaGVhZGVyc2luc3QKaW5kZXggODc2YjQyY2ZlZGU0Li4xNmFjM2U3MTA1 MGUgMTAwNjQ0Ci0tLSBhL3NjcmlwdHMvTWFrZWZpbGUuaGVhZGVyc2luc3QKKysrIGIvc2NyaXB0 cy9NYWtlZmlsZS5oZWFkZXJzaW5zdApAQCAtMSwxNyArMSwxOSBAQAogIyA9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQogIyBJbnN0YWxsaW5nIGhlYWRlcnMKICMKLSMgaGVhZGVyLXkgIC0gbGlzdCBmaWxlcyB0 byBiZSBpbnN0YWxsZWQuIFRoZXkgYXJlIHByZXByb2Nlc3NlZAotIyAgICAgICAgICAgICB0byBy ZW1vdmUgX19LRVJORUxfXyBzZWN0aW9uIG9mIHRoZSBmaWxlCi0jIGdlbmhkci15ICAtIFNhbWUg YXMgaGVhZGVyLXkgYnV0IGluIGEgZ2VuZXJhdGVkLyBkaXJlY3RvcnkKKyMgQWxsIGhlYWRlcnMg dW5kZXIgaW5jbHVkZS91YXBpLCBpbmNsdWRlL2dlbmVyYXRlZC91YXBpLAorIyBhcmNoLzxhcmNo Pi9pbmNsdWRlL3VhcGkvYXNtIGFuZCBhcmNoLzxhcmNoPi9pbmNsdWRlL2dlbmVyYXRlZC91YXBp L2FzbSBhcmUKKyMgZXhwb3J0ZWQuCisjIFRoZXkgYXJlIHByZXByb2Nlc3NlZCB0byByZW1vdmUg X19LRVJORUxfXyBzZWN0aW9uIG9mIHRoZSBmaWxlLgogIwogIyA9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQog CiAjIGdlbmVyYXRlZCBoZWFkZXIgZGlyZWN0b3J5CiBnZW4gOj0gJChpZiAkKGdlbiksJChnZW4p LCQoc3Vic3QgaW5jbHVkZS8saW5jbHVkZS9nZW5lcmF0ZWQvLCQob2JqKSkpCiAKKyMgS2J1aWxk IGZpbGUgaXMgb3B0aW9uYWwKIGtidWlsZC1maWxlIDo9ICQoc3JjdHJlZSkvJChvYmopL0tidWls ZAotaW5jbHVkZSAkKGtidWlsZC1maWxlKQorLWluY2x1ZGUgJChrYnVpbGQtZmlsZSkKIAogIyBj YWxsZWQgbWF5IHNldCBkZXN0aW5hdGlvbiBkaXIgKHdoZW4gaW5zdGFsbGluZyB0byBhc20vKQog X2RzdCA6PSAkKGlmICQoZHN0KSwkKGRzdCksJChvYmopKQpAQCAtMjUsOSArMjcsMTIgQEAgaW5j bHVkZSBzY3JpcHRzL0tidWlsZC5pbmNsdWRlCiAKIGluc3RhbGxkaXIgICAgOj0gJChJTlNUQUxM X0hEUl9QQVRIKS8kKHN1YnN0IHVhcGkvLCwkKF9kc3QpKQogCi1oZWFkZXIteSAgICAgIDo9ICQo c29ydCAkKGhlYWRlci15KSkKLXN1YmRpcnMgICAgICAgOj0gJChwYXRzdWJzdCAlLywlLCQoZmls dGVyICUvLCAkKGhlYWRlci15KSkpCi1oZWFkZXIteSAgICAgIDo9ICQoZmlsdGVyLW91dCAlLywg JChoZWFkZXIteSkpCitzdWJkaXJzICAgICAgIDo9ICQocGF0c3Vic3QgJChzcmN0cmVlKS8kKG9i aikvJS8uLCUsJCh3aWxkY2FyZCAkKHNyY3RyZWUpLyQob2JqKS8qLy4pKQorc3ViZGlycyAgICAg ICArPSAkKHN1YmRpci15KQoraGVhZGVyLWZpbGVzICA6PSAkKG5vdGRpciAkKHdpbGRjYXJkICQo c3JjdHJlZSkvJChvYmopLyouaCkpCitoZWFkZXItZmlsZXMgICs9ICQobm90ZGlyICQod2lsZGNh cmQgJChzcmN0cmVlKS8kKG9iaikvKi5hZ2gpKQorZ2VuaGRyLWZpbGVzICA6PSAkKG5vdGRpciAk KHdpbGRjYXJkICQoc3JjdHJlZSkvJChnZW4pLyouaCkpCitnZW5oZHItZmlsZXMgIDo9ICQoZmls dGVyLW91dCAkKGhlYWRlci1maWxlcyksICQoZ2VuaGRyLWZpbGVzKSkKIAogIyBmaWxlcyB1c2Vk IHRvIHRyYWNrIHN0YXRlIG9mIGluc3RhbGwvY2hlY2sKIGluc3RhbGwtZmlsZSAgOj0gJChpbnN0 YWxsZGlyKS8uaW5zdGFsbApAQCAtMzUsMjUgKzQwLDIzIEBAIGNoZWNrLWZpbGUgICAgOj0gJChp bnN0YWxsZGlyKS8uY2hlY2sKIAogIyBnZW5lcmljLXkgbGlzdCBhbGwgZmlsZXMgYW4gYXJjaGl0 ZWN0dXJlIHVzZXMgZnJvbSBhc20tZ2VuZXJpYwogIyBVc2UgdGhpcyB0byBidWlsZCBhIGxpc3Qg b2YgaGVhZGVycyB3aGljaCByZXF1aXJlIGEgd3JhcHBlcgotd3JhcHBlci1maWxlcyA6PSAkKGZp bHRlciAkKGhlYWRlci15KSwgJChnZW5lcmljLXkpKQorZ2VuZXJpYy1maWxlcyA6PSAkKG5vdGRp ciAkKHdpbGRjYXJkICQoc3JjdHJlZSkvaW5jbHVkZS91YXBpL2FzbS1nZW5lcmljLyouaCkpCit3 cmFwcGVyLWZpbGVzIDo9ICQoZmlsdGVyICQoZ2VuZXJpYy1maWxlcyksICQoZ2VuZXJpYy15KSkK K3dyYXBwZXItZmlsZXMgOj0gJChmaWx0ZXItb3V0ICQoaGVhZGVyLWZpbGVzKSwgJCh3cmFwcGVy LWZpbGVzKSkKIAogc3JjZGlyICAgICAgICA6PSAkKHNyY3RyZWUpLyQob2JqKQogZ2VuZGlyICAg ICAgICA6PSAkKG9ianRyZWUpLyQoZ2VuKQogCiAjIGFsbCBoZWFkZXJzIGZpbGVzIGZvciB0aGlz IGRpcgotaGVhZGVyLXkgICAgICA6PSAkKGZpbHRlci1vdXQgJChnZW5lcmljLXkpLCAkKGhlYWRl ci15KSkKLWFsbC1maWxlcyAgICAgOj0gJChoZWFkZXIteSkgJChnZW5oZHIteSkgJCh3cmFwcGVy LWZpbGVzKQorYWxsLWZpbGVzICAgICA6PSAkKGhlYWRlci1maWxlcykgJChnZW5oZHItZmlsZXMp ICQod3JhcHBlci1maWxlcykKIG91dHB1dC1maWxlcyAgOj0gJChhZGRwcmVmaXggJChpbnN0YWxs ZGlyKS8sICQoYWxsLWZpbGVzKSkKIAotIyBDaGVjayB0aGF0IGFsbCBleHBlY3RlZCBmaWxlcyBl eGlzdAotJChmb3JlYWNoIGhkciwgJChoZWFkZXIteSksIFwKLSAgJChpZiAkKHdpbGRjYXJkICQo c3JjZGlyKS8kKGhkcikpLCwgXAotICAgICAgICQoZXJyb3IgTWlzc2luZyBVQVBJIGZpbGUgJChz cmNkaXIpLyQoaGRyKSkgXAotICAgKSkKLSQoZm9yZWFjaCBoZHIsICQoZ2VuaGRyLXkpLCBcCi0g ICQoaWYJJCh3aWxkY2FyZCAkKGdlbmRpcikvJChoZHIpKSwsIFwKLSAgICAgICAkKGVycm9yIE1p c3NpbmcgZ2VuZXJhdGVkIFVBUEkgZmlsZSAkKGdlbmRpcikvJChoZHIpKSBcCi0gICkpCitpZm5l cSAoJChtYW5kYXRvcnkteSksKQorbWlzc2luZyAgICAgICA6PSAkKGZpbHRlci1vdXQgJChhbGwt ZmlsZXMpLCQobWFuZGF0b3J5LXkpKQoraWZuZXEgKCQobWlzc2luZyksKQorJChlcnJvciBTb21l IG1hbmRhdG9yeSBoZWFkZXJzICgkKG1pc3NpbmcpKSBhcmUgbWlzc2luZyBpbiAkKG9iaikpCitl bmRpZgorZW5kaWYKIAogIyBXb3JrIG91dCB3aGF0IG5lZWRzIHRvIGJlIHJlbW92ZWQKIG9sZGhl YWRlcnMgICAgOj0gJChwYXRzdWJzdCAkKGluc3RhbGxkaXIpLyUsJSwkKHdpbGRjYXJkICQoaW5z dGFsbGRpcikvKi5oKSkKQEAgLTY3LDggKzcwLDggQEAgcHJpbnRkaXIgPSAkKHBhdHN1YnN0ICQo SU5TVEFMTF9IRFJfUEFUSCkvJS8sJSwkKGRpciAkQCkpCiBxdWlldF9jbWRfaW5zdGFsbCA9IElO U1RBTEwgJChwcmludGRpcikgKCQod29yZHMgJChhbGwtZmlsZXMpKVwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBmaWxlJChpZiAkKHdvcmQgMiwgJChhbGwtZmlsZXMpKSxzKSkKICAgICAg IGNtZF9pbnN0YWxsID0gXAotICAgICAgICAkKENPTkZJR19TSEVMTCkgJDwgJChpbnN0YWxsZGly KSAkKHNyY2RpcikgJChoZWFkZXIteSk7IFwKLSAgICAgICAgJChDT05GSUdfU0hFTEwpICQ8ICQo aW5zdGFsbGRpcikgJChnZW5kaXIpICQoZ2VuaGRyLXkpOyBcCisgICAgICAgICQoQ09ORklHX1NI RUxMKSAkPCAkKGluc3RhbGxkaXIpICQoc3JjZGlyKSAkKGhlYWRlci1maWxlcyk7IFwKKyAgICAg ICAgJChDT05GSUdfU0hFTEwpICQ8ICQoaW5zdGFsbGRpcikgJChnZW5kaXIpICQoZ2VuaGRyLWZp bGVzKTsgXAogICAgICAgICBmb3IgRiBpbiAkKHdyYXBwZXItZmlsZXMpOyBkbyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgXAogICAgICAgICAgICAgICAgIGVjaG8gIlwjaW5jbHVk ZSA8YXNtLWdlbmVyaWMvJCRGPiIgPiAkKGluc3RhbGxkaXIpLyQkRjsgICAgXAogICAgICAgICBk b25lOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgXAotLSAKMi44LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3Jn Cmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 7/8] uapi: export all headers under uapi directories @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h .install asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h linux/userio.h linux/pr.h linux/wil6210_uapi.h linux/a.out.h linux/nilfs2_ondisk.h linux/hash_info.h linux/seg6_genl.h linux/seg6_hmac.h linux/batman_adv.h linux/nsfs.h linux/qrtr.h linux/btrfs_tree.h linux/coresight-stm.h linux/dma-buf.h linux/module.h linux/lightnvm.h linux/nilfs2_api.h asm-cris/kvm_para.h asm-arc/kvm_para.h asm-arc/ucontext.h ..install.cmd asm-c6x/shmparam.h asm-c6x/ucontext.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. For the record, note that exported files for asm directories are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/<arch>/include/uapi/asm/Kbuild; - arch/<arch>/include/asm/Kbuild. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Mark Salter <msalter@redhat.com> --- Documentation/kbuild/makefiles.txt | 55 ++-- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 3 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 58 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 483 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 45 +-- 81 files changed, 92 insertions(+), 1745 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..51c072049e45 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,10 +44,11 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 mandatory-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y + --- 7.5 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1235,7 +1236,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1263,33 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. -See subsequent chapter for the syntax of the Kbuild file. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. - --- 7.1 header-y +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. +See subsequent chapter for the syntax of the Kbuild file. - header-y specifies header files to be exported. + --- 7.1 mandatory-y - Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm + to define the minimun set of headers that must be exported in + include/asm. - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y @@ -1334,6 +1331,18 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h + --- 7.5 subdir-y + + subdir-y may be used to specify a subdirectory to be exported. + + Example: + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ + + The convention is to list one subdir per line and + preferably in alphabetic order. + === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 69c965304146..374bd123329f 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,6 +1,5 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h - generic-y += setup.h generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y += - - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 1c532b3f18ea..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,61 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..8e6b335664f2 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +mandatory-y += auxvec.h +mandatory-y += bitsperlong.h +mandatory-y += byteorder.h +mandatory-y += errno.h +mandatory-y += fcntl.h +mandatory-y += ioctl.h +mandatory-y += ioctls.h +mandatory-y += ipcbuf.h +mandatory-y += mman.h +mandatory-y += msgbuf.h +mandatory-y += param.h +mandatory-y += poll.h +mandatory-y += posix_types.h +mandatory-y += ptrace.h +mandatory-y += resource.h +mandatory-y += sembuf.h +mandatory-y += setup.h +mandatory-y += shmbuf.h +mandatory-y += sigcontext.h +mandatory-y += siginfo.h +mandatory-y += signal.h +mandatory-y += socket.h +mandatory-y += sockios.h +mandatory-y += stat.h +mandatory-y += statfs.h +mandatory-y += swab.h +mandatory-y += termbits.h +mandatory-y += termios.h +mandatory-y += types.h +mandatory-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +mandatory-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index f330ba4547cf..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,483 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += timerfd.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..16ac3e71050e 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,19 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +27,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,25 +40,23 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) +ifneq ($(mandatory-y),) +missing := $(filter-out $(all-files),$(mandatory-y)) +ifneq ($(missing),) +$(error Some mandatory headers ($(missing)) are missing in $(obj)) +endif +endif # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -67,8 +70,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v3 7/8] uapi: export all headers under uapi directories 2017-01-13 10:46 ` Nicolas Dichtel ` (5 preceding siblings ...) (?) @ 2017-01-23 9:00 ` Michael Ellerman -1 siblings, 0 replies; 554+ messages in thread From: Michael Ellerman @ 2017-01-23 9:00 UTC (permalink / raw) To: Nicolas Dichtel; +Cc: linux-arch, linux-kbuild, linux-kernel, linuxppc-dev Nicolas Dichtel <nicolas.dichtel@6wind.com> writes: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): ... > asm-powerpc/perf_regs.h ... > arch/powerpc/include/uapi/asm/Kbuild | 45 --- Thanks for cleaning it up. Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) cheers ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 8/8] uapi: export all arch specifics directories 2017-01-13 10:46 ` Nicolas Dichtel ` (3 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k This patch removes the need of subdir-y. Now all files/directories under arch/<arch>/include/uapi/ are exported. The only change for userland is the layout of the command 'make headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. Those new directories contains all files/directories of the specified arch. Note that only cris and tile have more directories than only asm: - arch-v[10|32] for cris; - arch for tile. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 15 +-------------- Makefile | 4 ++-- arch/cris/include/uapi/asm/Kbuild | 3 --- arch/tile/include/uapi/asm/Kbuild | 2 -- scripts/Makefile.headersinst | 3 +-- 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 51c072049e45..87a3d7d86776 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -48,7 +48,6 @@ This document describes the Linux kernel Makefiles. --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y - --- 7.5 subdir-y == 8 Kbuild Variables == 9 Makefile language @@ -1264,7 +1263,7 @@ The pre-processing does: - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) All headers under include/uapi/, include/generated/uapi/, -arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/ are exported. A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and @@ -1331,18 +1330,6 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h - --- 7.5 subdir-y - - subdir-y may be used to specify a subdirectory to be exported. - - Example: - #arch/cris/include/uapi/asm/Kbuild - subdir-y += ../arch-v10/arch/ - subdir-y += ../arch-v32/arch/ - - The convention is to list one subdir per line and - preferably in alphabetic order. - == 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/Makefile b/Makefile index 5f1a84735ff6..a35098157b69 100644 --- a/Makefile +++ b/Makefile @@ -1126,7 +1126,7 @@ firmware_install: export INSTALL_HDR_PATH = $(objtree)/usr # If we do an all arch process set dst to asm-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) PHONY += archheaders archheaders: @@ -1147,7 +1147,7 @@ headers_install: __headers $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d0c5471856e0..b15bf6bc0e94 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -subdir-y += ../arch-v10/arch/ -subdir-y += ../arch-v32/arch/ diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index e0a50111e07f..0c74c3c5ebfa 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -2,5 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ucontext.h - -subdir-y += ../arch diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 16ac3e71050e..cafaca2d9a23 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -2,7 +2,7 @@ # Installing headers # # All headers under include/uapi, include/generated/uapi, -# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are # exported. # They are preprocessed to remove __KERNEL__ section of the file. # @@ -28,7 +28,6 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) -subdirs += $(subdir-y) header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v3 8/8] uapi: export all arch specifics directories @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: openrisc This patch removes the need of subdir-y. Now all files/directories under arch/<arch>/include/uapi/ are exported. The only change for userland is the layout of the command 'make headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. Those new directories contains all files/directories of the specified arch. Note that only cris and tile have more directories than only asm: - arch-v[10|32] for cris; - arch for tile. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 15 +-------------- Makefile | 4 ++-- arch/cris/include/uapi/asm/Kbuild | 3 --- arch/tile/include/uapi/asm/Kbuild | 2 -- scripts/Makefile.headersinst | 3 +-- 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 51c072049e45..87a3d7d86776 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -48,7 +48,6 @@ This document describes the Linux kernel Makefiles. --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y - --- 7.5 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1264,7 +1263,7 @@ The pre-processing does: - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) All headers under include/uapi/, include/generated/uapi/, -arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/ are exported. A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and @@ -1331,18 +1330,6 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h - --- 7.5 subdir-y - - subdir-y may be used to specify a subdirectory to be exported. - - Example: - #arch/cris/include/uapi/asm/Kbuild - subdir-y += ../arch-v10/arch/ - subdir-y += ../arch-v32/arch/ - - The convention is to list one subdir per line and - preferably in alphabetic order. - === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/Makefile b/Makefile index 5f1a84735ff6..a35098157b69 100644 --- a/Makefile +++ b/Makefile @@ -1126,7 +1126,7 @@ firmware_install: export INSTALL_HDR_PATH = $(objtree)/usr # If we do an all arch process set dst to asm-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) PHONY += archheaders archheaders: @@ -1147,7 +1147,7 @@ headers_install: __headers $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d0c5471856e0..b15bf6bc0e94 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -subdir-y += ../arch-v10/arch/ -subdir-y += ../arch-v32/arch/ diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index e0a50111e07f..0c74c3c5ebfa 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -2,5 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ucontext.h - -subdir-y += ../arch diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 16ac3e71050e..cafaca2d9a23 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -2,7 +2,7 @@ # Installing headers # # All headers under include/uapi, include/generated/uapi, -# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are # exported. # They are preprocessed to remove __KERNEL__ section of the file. # @@ -28,7 +28,6 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) -subdirs += $(subdir-y) header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 8/8] uapi: export all arch specifics directories @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: linux-snps-arc This patch removes the need of subdir-y. Now all files/directories under arch/<arch>/include/uapi/ are exported. The only change for userland is the layout of the command 'make headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. Those new directories contains all files/directories of the specified arch. Note that only cris and tile have more directories than only asm: - arch-v[10|32] for cris; - arch for tile. Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> --- Documentation/kbuild/makefiles.txt | 15 +-------------- Makefile | 4 ++-- arch/cris/include/uapi/asm/Kbuild | 3 --- arch/tile/include/uapi/asm/Kbuild | 2 -- scripts/Makefile.headersinst | 3 +-- 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 51c072049e45..87a3d7d86776 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -48,7 +48,6 @@ This document describes the Linux kernel Makefiles. --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y - --- 7.5 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1264,7 +1263,7 @@ The pre-processing does: - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) All headers under include/uapi/, include/generated/uapi/, -arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/ are exported. A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and @@ -1331,18 +1330,6 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h - --- 7.5 subdir-y - - subdir-y may be used to specify a subdirectory to be exported. - - Example: - #arch/cris/include/uapi/asm/Kbuild - subdir-y += ../arch-v10/arch/ - subdir-y += ../arch-v32/arch/ - - The convention is to list one subdir per line and - preferably in alphabetic order. - === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/Makefile b/Makefile index 5f1a84735ff6..a35098157b69 100644 --- a/Makefile +++ b/Makefile @@ -1126,7 +1126,7 @@ firmware_install: export INSTALL_HDR_PATH = $(objtree)/usr # If we do an all arch process set dst to asm-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) PHONY += archheaders archheaders: @@ -1147,7 +1147,7 @@ headers_install: __headers $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d0c5471856e0..b15bf6bc0e94 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -subdir-y += ../arch-v10/arch/ -subdir-y += ../arch-v32/arch/ diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index e0a50111e07f..0c74c3c5ebfa 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -2,5 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ucontext.h - -subdir-y += ../arch diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 16ac3e71050e..cafaca2d9a23 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -2,7 +2,7 @@ # Installing headers # # All headers under include/uapi, include/generated/uapi, -# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are # exported. # They are preprocessed to remove __KERNEL__ section of the file. # @@ -28,7 +28,6 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) -subdirs += $(subdir-y) header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 8/8] uapi: export all arch specifics directories @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, Nicolas Dichtel This patch removes the need of subdir-y. Now all files/directories under arch/<arch>/include/uapi/ are exported. The only change for userland is the layout of the command 'make headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. Those new directories contains all files/directories of the specified arch. Note that only cris and tile have more directories than only asm: - arch-v[10|32] for cris; - arch for tile. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 15 +-------------- Makefile | 4 ++-- arch/cris/include/uapi/asm/Kbuild | 3 --- arch/tile/include/uapi/asm/Kbuild | 2 -- scripts/Makefile.headersinst | 3 +-- 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 51c072049e45..87a3d7d86776 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -48,7 +48,6 @@ This document describes the Linux kernel Makefiles. --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y - --- 7.5 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1264,7 +1263,7 @@ The pre-processing does: - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) All headers under include/uapi/, include/generated/uapi/, -arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/ are exported. A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and @@ -1331,18 +1330,6 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h - --- 7.5 subdir-y - - subdir-y may be used to specify a subdirectory to be exported. - - Example: - #arch/cris/include/uapi/asm/Kbuild - subdir-y += ../arch-v10/arch/ - subdir-y += ../arch-v32/arch/ - - The convention is to list one subdir per line and - preferably in alphabetic order. - === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/Makefile b/Makefile index 5f1a84735ff6..a35098157b69 100644 --- a/Makefile +++ b/Makefile @@ -1126,7 +1126,7 @@ firmware_install: export INSTALL_HDR_PATH = $(objtree)/usr # If we do an all arch process set dst to asm-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) PHONY += archheaders archheaders: @@ -1147,7 +1147,7 @@ headers_install: __headers $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d0c5471856e0..b15bf6bc0e94 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -subdir-y += ../arch-v10/arch/ -subdir-y += ../arch-v32/arch/ diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index e0a50111e07f..0c74c3c5ebfa 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -2,5 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ucontext.h - -subdir-y += ../arch diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 16ac3e71050e..cafaca2d9a23 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -2,7 +2,7 @@ # Installing headers # # All headers under include/uapi, include/generated/uapi, -# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are # exported. # They are preprocessed to remove __KERNEL__ section of the file. # @@ -28,7 +28,6 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) -subdirs += $(subdir-y) header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 8/8] uapi: export all arch specifics directories @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, Nicolas Dichtel This patch removes the need of subdir-y. Now all files/directories under arch/<arch>/include/uapi/ are exported. The only change for userland is the layout of the command 'make headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. Those new directories contains all files/directories of the specified arch. Note that only cris and tile have more directories than only asm: - arch-v[10|32] for cris; - arch for tile. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 15 +-------------- Makefile | 4 ++-- arch/cris/include/uapi/asm/Kbuild | 3 --- arch/tile/include/uapi/asm/Kbuild | 2 -- scripts/Makefile.headersinst | 3 +-- 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 51c072049e45..87a3d7d86776 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -48,7 +48,6 @@ This document describes the Linux kernel Makefiles. --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y - --- 7.5 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1264,7 +1263,7 @@ The pre-processing does: - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) All headers under include/uapi/, include/generated/uapi/, -arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/ are exported. A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and @@ -1331,18 +1330,6 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h - --- 7.5 subdir-y - - subdir-y may be used to specify a subdirectory to be exported. - - Example: - #arch/cris/include/uapi/asm/Kbuild - subdir-y += ../arch-v10/arch/ - subdir-y += ../arch-v32/arch/ - - The convention is to list one subdir per line and - preferably in alphabetic order. - === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/Makefile b/Makefile index 5f1a84735ff6..a35098157b69 100644 --- a/Makefile +++ b/Makefile @@ -1126,7 +1126,7 @@ firmware_install: export INSTALL_HDR_PATH = $(objtree)/usr # If we do an all arch process set dst to asm-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) PHONY += archheaders archheaders: @@ -1147,7 +1147,7 @@ headers_install: __headers $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d0c5471856e0..b15bf6bc0e94 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -subdir-y += ../arch-v10/arch/ -subdir-y += ../arch-v32/arch/ diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index e0a50111e07f..0c74c3c5ebfa 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -2,5 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ucontext.h - -subdir-y += ../arch diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 16ac3e71050e..cafaca2d9a23 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -2,7 +2,7 @@ # Installing headers # # All headers under include/uapi, include/generated/uapi, -# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are # exported. # They are preprocessed to remove __KERNEL__ section of the file. # @@ -28,7 +28,6 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) -subdirs += $(subdir-y) header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 8/8] uapi: export all arch specifics directories @ 2017-01-13 10:46 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k This patch removes the need of subdir-y. Now all files/directories under arch/<arch>/include/uapi/ are exported. The only change for userland is the layout of the command 'make headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. Those new directories contains all files/directories of the specified arch. Note that only cris and tile have more directories than only asm: - arch-v[10|32] for cris; - arch for tile. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 15 +-------------- Makefile | 4 ++-- arch/cris/include/uapi/asm/Kbuild | 3 --- arch/tile/include/uapi/asm/Kbuild | 2 -- scripts/Makefile.headersinst | 3 +-- 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 51c072049e45..87a3d7d86776 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -48,7 +48,6 @@ This document describes the Linux kernel Makefiles. --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y - --- 7.5 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1264,7 +1263,7 @@ The pre-processing does: - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) All headers under include/uapi/, include/generated/uapi/, -arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/ are exported. A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and @@ -1331,18 +1330,6 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h - --- 7.5 subdir-y - - subdir-y may be used to specify a subdirectory to be exported. - - Example: - #arch/cris/include/uapi/asm/Kbuild - subdir-y += ../arch-v10/arch/ - subdir-y += ../arch-v32/arch/ - - The convention is to list one subdir per line and - preferably in alphabetic order. - === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/Makefile b/Makefile index 5f1a84735ff6..a35098157b69 100644 --- a/Makefile +++ b/Makefile @@ -1126,7 +1126,7 @@ firmware_install: export INSTALL_HDR_PATH = $(objtree)/usr # If we do an all arch process set dst to asm-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) PHONY += archheaders archheaders: @@ -1147,7 +1147,7 @@ headers_install: __headers $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d0c5471856e0..b15bf6bc0e94 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -subdir-y += ../arch-v10/arch/ -subdir-y += ../arch-v32/arch/ diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index e0a50111e07f..0c74c3c5ebfa 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -2,5 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ucontext.h - -subdir-y += ../arch diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 16ac3e71050e..cafaca2d9a23 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -2,7 +2,7 @@ # Installing headers # # All headers under include/uapi, include/generated/uapi, -# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are # exported. # They are preprocessed to remove __KERNEL__ section of the file. # @@ -28,7 +28,6 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) -subdirs += $(subdir-y) header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 8/8] uapi: export all arch specifics directories 2017-01-13 10:46 ` Nicolas Dichtel ` (21 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k This patch removes the need of subdir-y. Now all files/directories under arch/<arch>/include/uapi/ are exported. The only change for userland is the layout of the command 'make headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. Those new directories contains all files/directories of the specified arch. Note that only cris and tile have more directories than only asm: - arch-v[10|32] for cris; - arch for tile. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 15 +-------------- Makefile | 4 ++-- arch/cris/include/uapi/asm/Kbuild | 3 --- arch/tile/include/uapi/asm/Kbuild | 2 -- scripts/Makefile.headersinst | 3 +-- 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 51c072049e45..87a3d7d86776 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -48,7 +48,6 @@ This document describes the Linux kernel Makefiles. --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y - --- 7.5 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1264,7 +1263,7 @@ The pre-processing does: - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) All headers under include/uapi/, include/generated/uapi/, -arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/ are exported. A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and @@ -1331,18 +1330,6 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h - --- 7.5 subdir-y - - subdir-y may be used to specify a subdirectory to be exported. - - Example: - #arch/cris/include/uapi/asm/Kbuild - subdir-y += ../arch-v10/arch/ - subdir-y += ../arch-v32/arch/ - - The convention is to list one subdir per line and - preferably in alphabetic order. - === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/Makefile b/Makefile index 5f1a84735ff6..a35098157b69 100644 --- a/Makefile +++ b/Makefile @@ -1126,7 +1126,7 @@ firmware_install: export INSTALL_HDR_PATH = $(objtree)/usr # If we do an all arch process set dst to asm-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) PHONY += archheaders archheaders: @@ -1147,7 +1147,7 @@ headers_install: __headers $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d0c5471856e0..b15bf6bc0e94 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -subdir-y += ../arch-v10/arch/ -subdir-y += ../arch-v32/arch/ diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index e0a50111e07f..0c74c3c5ebfa 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -2,5 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ucontext.h - -subdir-y += ../arch diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 16ac3e71050e..cafaca2d9a23 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -2,7 +2,7 @@ # Installing headers # # All headers under include/uapi, include/generated/uapi, -# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are # exported. # They are preprocessed to remove __KERNEL__ section of the file. # @@ -28,7 +28,6 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) -subdirs += $(subdir-y) header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 8/8] uapi: export all arch specifics directories 2017-01-13 10:46 ` Nicolas Dichtel ` (22 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch This patch removes the need of subdir-y. Now all files/directories under arch/<arch>/include/uapi/ are exported. The only change for userland is the layout of the command 'make headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. Those new directories contains all files/directories of the specified arch. Note that only cris and tile have more directories than only asm: - arch-v[10|32] for cris; - arch for tile. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 15 +-------------- Makefile | 4 ++-- arch/cris/include/uapi/asm/Kbuild | 3 --- arch/tile/include/uapi/asm/Kbuild | 2 -- scripts/Makefile.headersinst | 3 +-- 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 51c072049e45..87a3d7d86776 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -48,7 +48,6 @@ This document describes the Linux kernel Makefiles. --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y - --- 7.5 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1264,7 +1263,7 @@ The pre-processing does: - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) All headers under include/uapi/, include/generated/uapi/, -arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/ are exported. A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and @@ -1331,18 +1330,6 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h - --- 7.5 subdir-y - - subdir-y may be used to specify a subdirectory to be exported. - - Example: - #arch/cris/include/uapi/asm/Kbuild - subdir-y += ../arch-v10/arch/ - subdir-y += ../arch-v32/arch/ - - The convention is to list one subdir per line and - preferably in alphabetic order. - === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/Makefile b/Makefile index 5f1a84735ff6..a35098157b69 100644 --- a/Makefile +++ b/Makefile @@ -1126,7 +1126,7 @@ firmware_install: export INSTALL_HDR_PATH = $(objtree)/usr # If we do an all arch process set dst to asm-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) PHONY += archheaders archheaders: @@ -1147,7 +1147,7 @@ headers_install: __headers $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d0c5471856e0..b15bf6bc0e94 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -subdir-y += ../arch-v10/arch/ -subdir-y += ../arch-v32/arch/ diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index e0a50111e07f..0c74c3c5ebfa 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -2,5 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ucontext.h - -subdir-y += ../arch diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 16ac3e71050e..cafaca2d9a23 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -2,7 +2,7 @@ # Installing headers # # All headers under include/uapi, include/generated/uapi, -# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are # exported. # They are preprocessed to remove __KERNEL__ section of the file. # @@ -28,7 +28,6 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) -subdirs += $(subdir-y) header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* (no subject) 2017-01-13 10:46 ` Nicolas Dichtel ` (23 preceding siblings ...) (?) @ 2017-01-13 15:36 ` David Howells -1 siblings, 0 replies; 554+ messages in thread From: David Howells @ 2017-01-13 15:36 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, linux-m68k, linux-ia64, linux-doc, alsa-devel, dri-devel, dhowells, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, openrisc, linux-fbdev, linux-metag Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. Exported how? > +#ifdef __INT32_TYPE__ > +#undef __INT32_TYPE__ > +#define __INT32_TYPE__ int > +#endif > + > +#ifdef __UINT32_TYPE__ > +#undef __UINT32_TYPE__ > +#define __UINT32_TYPE__ unsigned int > +#endif > + > +#ifdef __UINTPTR_TYPE__ > +#undef __UINTPTR_TYPE__ > +#define __UINTPTR_TYPE__ unsigned long > +#endif These weren't defined by the kernel before, so why do we need to define them now? Will defining __UINTPTR_TYPE__ cause problems in compiling libboost by changing the signature on C++ functions that use uintptr_t? David _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* (unknown) 2017-01-13 10:46 ` Nicolas Dichtel ` (3 preceding siblings ...) (?) @ 2017-01-13 15:36 ` David Howells -1 siblings, 0 replies; 554+ messages in thread From: David Howells @ 2017-01-13 15:36 UTC (permalink / raw) To: Nicolas Dichtel Cc: dhowells, arnd, linux-mips, linux-m68k, linux-ia64, linux-doc, alsa-devel, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. Exported how? > +#ifdef __INT32_TYPE__ > +#undef __INT32_TYPE__ > +#define __INT32_TYPE__ int > +#endif > + > +#ifdef __UINT32_TYPE__ > +#undef __UINT32_TYPE__ > +#define __UINT32_TYPE__ unsigned int > +#endif > + > +#ifdef __UINTPTR_TYPE__ > +#undef __UINTPTR_TYPE__ > +#define __UINTPTR_TYPE__ unsigned long > +#endif These weren't defined by the kernel before, so why do we need to define them now? Will defining __UINTPTR_TYPE__ cause problems in compiling libboost by changing the signature on C++ functions that use uintptr_t? David ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] (no subject) @ 2017-01-13 15:36 ` David Howells 0 siblings, 0 replies; 554+ messages in thread From: David Howells @ 2017-01-13 15:36 UTC (permalink / raw) To: openrisc Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. Exported how? > +#ifdef __INT32_TYPE__ > +#undef __INT32_TYPE__ > +#define __INT32_TYPE__ int > +#endif > + > +#ifdef __UINT32_TYPE__ > +#undef __UINT32_TYPE__ > +#define __UINT32_TYPE__ unsigned int > +#endif > + > +#ifdef __UINTPTR_TYPE__ > +#undef __UINTPTR_TYPE__ > +#define __UINTPTR_TYPE__ unsigned long > +#endif These weren't defined by the kernel before, so why do we need to define them now? Will defining __UINTPTR_TYPE__ cause problems in compiling libboost by changing the signature on C++ functions that use uintptr_t? David ^ permalink raw reply [flat|nested] 554+ messages in thread
* No subject @ 2017-01-13 15:36 ` David Howells 0 siblings, 0 replies; 554+ messages in thread From: David Howells @ 2017-01-13 15:36 UTC (permalink / raw) To: linux-snps-arc Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. Exported how? > +#ifdef __INT32_TYPE__ > +#undef __INT32_TYPE__ > +#define __INT32_TYPE__ int > +#endif > + > +#ifdef __UINT32_TYPE__ > +#undef __UINT32_TYPE__ > +#define __UINT32_TYPE__ unsigned int > +#endif > + > +#ifdef __UINTPTR_TYPE__ > +#undef __UINTPTR_TYPE__ > +#define __UINTPTR_TYPE__ unsigned long > +#endif These weren't defined by the kernel before, so why do we need to define them now? Will defining __UINTPTR_TYPE__ cause problems in compiling libboost by changing the signature on C++ functions that use uintptr_t? David ^ permalink raw reply [flat|nested] 554+ messages in thread
* (no subject) @ 2017-01-13 15:36 ` David Howells 0 siblings, 0 replies; 554+ messages in thread From: David Howells @ 2017-01-13 15:36 UTC (permalink / raw) To: Nicolas Dichtel Cc: dhowells, arnd, linux-mips, linux-m68k, linux-ia64, linux-doc, alsa-devel, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, openrisc, linux-fbdev, linux-metag, linux-arm-kernel, linux-nfs, linux-parisc, linux-cris-kernel, linux-mmc, linux-kernel, linux-spi, netfilter-devel, linux-alpha, nio2-dev, linuxppc-dev Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. Exported how? > +#ifdef __INT32_TYPE__ > +#undef __INT32_TYPE__ > +#define __INT32_TYPE__ int > +#endif > + > +#ifdef __UINT32_TYPE__ > +#undef __UINT32_TYPE__ > +#define __UINT32_TYPE__ unsigned int > +#endif > + > +#ifdef __UINTPTR_TYPE__ > +#undef __UINTPTR_TYPE__ > +#define __UINTPTR_TYPE__ unsigned long > +#endif These weren't defined by the kernel before, so why do we need to define them now? Will defining __UINTPTR_TYPE__ cause problems in compiling libboost by changing the signature on C++ functions that use uintptr_t? David ^ permalink raw reply [flat|nested] 554+ messages in thread
* (no subject) @ 2017-01-13 15:36 ` David Howells 0 siblings, 0 replies; 554+ messages in thread From: David Howells @ 2017-01-13 15:36 UTC (permalink / raw) To: Nicolas Dichtel Cc: dhowells, arnd, linux-mips, linux-m68k, linux-ia64, linux-doc, alsa-devel, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, openrisc, linux-fbdev, linux-metag, linux-arm-kernel, linux-nfs, linux-parisc, linux-cris-kernel, linux-mmc, linux-kernel, linux-spi, netfilter-devel, linux-alpha, nio2-dev, linuxppc-dev Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. Exported how? > +#ifdef __INT32_TYPE__ > +#undef __INT32_TYPE__ > +#define __INT32_TYPE__ int > +#endif > + > +#ifdef __UINT32_TYPE__ > +#undef __UINT32_TYPE__ > +#define __UINT32_TYPE__ unsigned int > +#endif > + > +#ifdef __UINTPTR_TYPE__ > +#undef __UINTPTR_TYPE__ > +#define __UINTPTR_TYPE__ unsigned long > +#endif These weren't defined by the kernel before, so why do we need to define them now? Will defining __UINTPTR_TYPE__ cause problems in compiling libboost by changing the signature on C++ functions that use uintptr_t? David ^ permalink raw reply [flat|nested] 554+ messages in thread
* (unknown) @ 2017-01-13 15:36 ` David Howells 0 siblings, 0 replies; 554+ messages in thread From: David Howells @ 2017-01-13 15:36 UTC (permalink / raw) To: Nicolas Dichtel Cc: dhowells, arnd, linux-mips, linux-m68k, linux-ia64, linux-doc, alsa-devel, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux- Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. Exported how? > +#ifdef __INT32_TYPE__ > +#undef __INT32_TYPE__ > +#define __INT32_TYPE__ int > +#endif > + > +#ifdef __UINT32_TYPE__ > +#undef __UINT32_TYPE__ > +#define __UINT32_TYPE__ unsigned int > +#endif > + > +#ifdef __UINTPTR_TYPE__ > +#undef __UINTPTR_TYPE__ > +#define __UINTPTR_TYPE__ unsigned long > +#endif These weren't defined by the kernel before, so why do we need to define them now? Will defining __UINTPTR_TYPE__ cause problems in compiling libboost by changing the signature on C++ functions that use uintptr_t? David ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 1/8] arm: put types.h in uapi 2017-01-13 15:36 ` (unknown) David Howells ` (4 preceding siblings ...) (?) @ 2017-01-13 16:01 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 16:01 UTC (permalink / raw) To: David Howells Cc: linux-mips, linux-m68k, linux-ia64, linux-doc, alsa-devel, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, openrisc, linux-fbdev, linux-metag Please, do not remove the email subject when you reply. I restore it to ease the thread follow-up. Le 13/01/2017 à 16:36, David Howells a écrit : > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > >> This header file is exported, thus move it to uapi. > > Exported how? It is listed in include/uapi/asm-generic/Kbuild.asm, which is included by arch/arm/include/uapi/asm/Kbuild. You can also have a look at patch #5 to see why it was exported even if it was not in an uapi directory. Regards, Nicolas _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 1/8] arm: put types.h in uapi 2017-01-13 15:36 ` (unknown) David Howells ` (4 preceding siblings ...) (?) @ 2017-01-13 16:01 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 16:01 UTC (permalink / raw) To: David Howells Cc: arnd, linux-mips, linux-m68k, linux-ia64, linux-doc, alsa-devel, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid Please, do not remove the email subject when you reply. I restore it to ease the thread follow-up. Le 13/01/2017 à 16:36, David Howells a écrit : > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > >> This header file is exported, thus move it to uapi. > > Exported how? It is listed in include/uapi/asm-generic/Kbuild.asm, which is included by arch/arm/include/uapi/asm/Kbuild. You can also have a look at patch #5 to see why it was exported even if it was not in an uapi directory. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 16:01 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 16:01 UTC (permalink / raw) To: openrisc Please, do not remove the email subject when you reply. I restore it to ease the thread follow-up. Le 13/01/2017 à 16:36, David Howells a écrit : > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > >> This header file is exported, thus move it to uapi. > > Exported how? It is listed in include/uapi/asm-generic/Kbuild.asm, which is included by arch/arm/include/uapi/asm/Kbuild. You can also have a look at patch #5 to see why it was exported even if it was not in an uapi directory. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 16:01 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 16:01 UTC (permalink / raw) To: linux-arm-kernel Please, do not remove the email subject when you reply. I restore it to ease the thread follow-up. Le 13/01/2017 ? 16:36, David Howells a ?crit : > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > >> This header file is exported, thus move it to uapi. > > Exported how? It is listed in include/uapi/asm-generic/Kbuild.asm, which is included by arch/arm/include/uapi/asm/Kbuild. You can also have a look at patch #5 to see why it was exported even if it was not in an uapi directory. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 16:01 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 16:01 UTC (permalink / raw) To: linux-snps-arc Please, do not remove the email subject when you reply. I restore it to ease the thread follow-up. Le 13/01/2017 ? 16:36, David Howells a ?crit : > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > >> This header file is exported, thus move it to uapi. > > Exported how? It is listed in include/uapi/asm-generic/Kbuild.asm, which is included by arch/arm/include/uapi/asm/Kbuild. You can also have a look at patch #5 to see why it was exported even if it was not in an uapi directory. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 16:01 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 16:01 UTC (permalink / raw) To: David Howells Cc: arnd, linux-mips, linux-m68k, linux-ia64, linux-doc, alsa-devel, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, openrisc, linux-fbdev, linux-metag, linux-arm-kernel, linux-nfs, linux-parisc, linux-cris-kernel, linux-mmc, linux-kernel, linux-spi, netfilter-devel, linux-alpha, nio2-dev, linuxppc-dev Please, do not remove the email subject when you reply. I restore it to ease the thread follow-up. Le 13/01/2017 à 16:36, David Howells a écrit : > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > >> This header file is exported, thus move it to uapi. > > Exported how? It is listed in include/uapi/asm-generic/Kbuild.asm, which is included by arch/arm/include/uapi/asm/Kbuild. You can also have a look at patch #5 to see why it was exported even if it was not in an uapi directory. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 16:01 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 16:01 UTC (permalink / raw) To: David Howells Cc: arnd, linux-mips, linux-m68k, linux-ia64, linux-doc, alsa-devel, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid Please, do not remove the email subject when you reply. I restore it to ease the thread follow-up. Le 13/01/2017 à 16:36, David Howells a écrit : > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > >> This header file is exported, thus move it to uapi. > > Exported how? It is listed in include/uapi/asm-generic/Kbuild.asm, which is included by arch/arm/include/uapi/asm/Kbuild. You can also have a look at patch #5 to see why it was exported even if it was not in an uapi directory. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 16:01 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 16:01 UTC (permalink / raw) To: David Howells Cc: arnd, linux-mips, linux-m68k, linux-ia64, linux-doc, alsa-devel, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid Please, do not remove the email subject when you reply. I restore it to ease the thread follow-up. Le 13/01/2017 à 16:36, David Howells a écrit : > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > >> This header file is exported, thus move it to uapi. > > Exported how? It is listed in include/uapi/asm-generic/Kbuild.asm, which is included by arch/arm/include/uapi/asm/Kbuild. You can also have a look at patch #5 to see why it was exported even if it was not in an uapi directory. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 1/8] arm: put types.h in uapi 2017-01-13 16:01 ` Nicolas Dichtel ` (2 preceding siblings ...) (?) @ 2017-01-13 16:19 ` Russell King - ARM Linux -1 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-13 16:19 UTC (permalink / raw) To: Nicolas Dichtel Cc: David Howells, arnd, linux-mips, linux-m68k, linux-ia64, linux-doc, alsa-devel, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid On Fri, Jan 13, 2017 at 05:01:01PM +0100, Nicolas Dichtel wrote: > Please, do not remove the email subject when you reply. I restore it to > ease the thread follow-up. I mentioned it to David, and he says it's because the long list of recipients is breaking his mailer. I've already posed the question about whether that's exploitable! > Le 13/01/2017 à 16:36, David Howells a écrit : > > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > > > >> This header file is exported, thus move it to uapi. > > > > Exported how? > > It is listed in include/uapi/asm-generic/Kbuild.asm, which is included by > arch/arm/include/uapi/asm/Kbuild. We really should not be installing non-uapi header files to userland under _any_ circumstance - this to me sounds like a bug in kbuild. The assumption is that headers outside of uapi directories are not part of the user visible API, and so can be freely modified - which in the presence of this bug is untrue. However, as it's happening, and this header has been there since 2013 (commit 09096f6a0ee2 - "ARM: 7822/1: add workaround for ambiguous C99 stdint.h types") it's now well and truely part of the user API whether we intended it to be or not, so your patch looks to me like the correct thing to do. I think it needs further evaluation to make sure kbuild isn't going to do something else silly, like subsitute include/asm-generic/types.h for the now missing arch/arm/include/asm/types.h I wonder how many more headers are unintentionally exported. ... what a mess. :( -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 16:19 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-13 16:19 UTC (permalink / raw) To: openrisc On Fri, Jan 13, 2017 at 05:01:01PM +0100, Nicolas Dichtel wrote: > Please, do not remove the email subject when you reply. I restore it to > ease the thread follow-up. I mentioned it to David, and he says it's because the long list of recipients is breaking his mailer. I've already posed the question about whether that's exploitable! > Le 13/01/2017 à 16:36, David Howells a écrit : > > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > > > >> This header file is exported, thus move it to uapi. > > > > Exported how? > > It is listed in include/uapi/asm-generic/Kbuild.asm, which is included by > arch/arm/include/uapi/asm/Kbuild. We really should not be installing non-uapi header files to userland under _any_ circumstance - this to me sounds like a bug in kbuild. The assumption is that headers outside of uapi directories are not part of the user visible API, and so can be freely modified - which in the presence of this bug is untrue. However, as it's happening, and this header has been there since 2013 (commit 09096f6a0ee2 - "ARM: 7822/1: add workaround for ambiguous C99 stdint.h types") it's now well and truely part of the user API whether we intended it to be or not, so your patch looks to me like the correct thing to do. I think it needs further evaluation to make sure kbuild isn't going to do something else silly, like subsitute include/asm-generic/types.h for the now missing arch/arm/include/asm/types.h I wonder how many more headers are unintentionally exported. ... what a mess. :( -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 16:19 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-13 16:19 UTC (permalink / raw) To: linux-arm-kernel On Fri, Jan 13, 2017 at 05:01:01PM +0100, Nicolas Dichtel wrote: > Please, do not remove the email subject when you reply. I restore it to > ease the thread follow-up. I mentioned it to David, and he says it's because the long list of recipients is breaking his mailer. I've already posed the question about whether that's exploitable! > Le 13/01/2017 ? 16:36, David Howells a ?crit : > > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > > > >> This header file is exported, thus move it to uapi. > > > > Exported how? > > It is listed in include/uapi/asm-generic/Kbuild.asm, which is included by > arch/arm/include/uapi/asm/Kbuild. We really should not be installing non-uapi header files to userland under _any_ circumstance - this to me sounds like a bug in kbuild. The assumption is that headers outside of uapi directories are not part of the user visible API, and so can be freely modified - which in the presence of this bug is untrue. However, as it's happening, and this header has been there since 2013 (commit 09096f6a0ee2 - "ARM: 7822/1: add workaround for ambiguous C99 stdint.h types") it's now well and truely part of the user API whether we intended it to be or not, so your patch looks to me like the correct thing to do. I think it needs further evaluation to make sure kbuild isn't going to do something else silly, like subsitute include/asm-generic/types.h for the now missing arch/arm/include/asm/types.h I wonder how many more headers are unintentionally exported. ... what a mess. :( -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 16:19 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-13 16:19 UTC (permalink / raw) To: linux-snps-arc On Fri, Jan 13, 2017@05:01:01PM +0100, Nicolas Dichtel wrote: > Please, do not remove the email subject when you reply. I restore it to > ease the thread follow-up. I mentioned it to David, and he says it's because the long list of recipients is breaking his mailer. I've already posed the question about whether that's exploitable! > Le 13/01/2017 ? 16:36, David Howells a ?crit : > > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > > > >> This header file is exported, thus move it to uapi. > > > > Exported how? > > It is listed in include/uapi/asm-generic/Kbuild.asm, which is included by > arch/arm/include/uapi/asm/Kbuild. We really should not be installing non-uapi header files to userland under _any_ circumstance - this to me sounds like a bug in kbuild. The assumption is that headers outside of uapi directories are not part of the user visible API, and so can be freely modified - which in the presence of this bug is untrue. However, as it's happening, and this header has been there since 2013 (commit 09096f6a0ee2 - "ARM: 7822/1: add workaround for ambiguous C99 stdint.h types") it's now well and truely part of the user API whether we intended it to be or not, so your patch looks to me like the correct thing to do. I think it needs further evaluation to make sure kbuild isn't going to do something else silly, like subsitute include/asm-generic/types.h for the now missing arch/arm/include/asm/types.h I wonder how many more headers are unintentionally exported. ... what a mess. :( -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 1/8] arm: put types.h in uapi @ 2017-01-13 16:19 ` Russell King - ARM Linux 0 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-13 16:19 UTC (permalink / raw) To: Nicolas Dichtel Cc: David Howells, arnd, linux-mips, linux-m68k, linux-ia64, linux-doc, alsa-devel, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, openrisc, linux-fbdev, linux-metag, linux-arm-kernel, linux-nfs, linux-parisc, linux-cris-kernel, linux-mmc, linux-kernel, linux-spi, netfilter-devel, linux-alpha, nio2-dev, linuxppc-dev On Fri, Jan 13, 2017 at 05:01:01PM +0100, Nicolas Dichtel wrote: > Please, do not remove the email subject when you reply. I restore it to > ease the thread follow-up. I mentioned it to David, and he says it's because the long list of recipients is breaking his mailer. I've already posed the question about whether that's exploitable! > Le 13/01/2017 à 16:36, David Howells a écrit : > > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > > > >> This header file is exported, thus move it to uapi. > > > > Exported how? > > It is listed in include/uapi/asm-generic/Kbuild.asm, which is included by > arch/arm/include/uapi/asm/Kbuild. We really should not be installing non-uapi header files to userland under _any_ circumstance - this to me sounds like a bug in kbuild. The assumption is that headers outside of uapi directories are not part of the user visible API, and so can be freely modified - which in the presence of this bug is untrue. However, as it's happening, and this header has been there since 2013 (commit 09096f6a0ee2 - "ARM: 7822/1: add workaround for ambiguous C99 stdint.h types") it's now well and truely part of the user API whether we intended it to be or not, so your patch looks to me like the correct thing to do. I think it needs further evaluation to make sure kbuild isn't going to do something else silly, like subsitute include/asm-generic/types.h for the now missing arch/arm/include/asm/types.h I wonder how many more headers are unintentionally exported. ... what a mess. :( -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 1/8] arm: put types.h in uapi 2017-01-13 16:01 ` Nicolas Dichtel ` (6 preceding siblings ...) (?) @ 2017-01-13 16:19 ` Russell King - ARM Linux -1 siblings, 0 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-13 16:19 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, linux-m68k, linux-ia64, linux-doc, alsa-devel, dri-devel, David Howells, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, openrisc, linux-fbdev, linux-metag On Fri, Jan 13, 2017 at 05:01:01PM +0100, Nicolas Dichtel wrote: > Please, do not remove the email subject when you reply. I restore it to > ease the thread follow-up. I mentioned it to David, and he says it's because the long list of recipients is breaking his mailer. I've already posed the question about whether that's exploitable! > Le 13/01/2017 à 16:36, David Howells a écrit : > > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > > > >> This header file is exported, thus move it to uapi. > > > > Exported how? > > It is listed in include/uapi/asm-generic/Kbuild.asm, which is included by > arch/arm/include/uapi/asm/Kbuild. We really should not be installing non-uapi header files to userland under _any_ circumstance - this to me sounds like a bug in kbuild. The assumption is that headers outside of uapi directories are not part of the user visible API, and so can be freely modified - which in the presence of this bug is untrue. However, as it's happening, and this header has been there since 2013 (commit 09096f6a0ee2 - "ARM: 7822/1: add workaround for ambiguous C99 stdint.h types") it's now well and truely part of the user API whether we intended it to be or not, so your patch looks to me like the correct thing to do. I think it needs further evaluation to make sure kbuild isn't going to do something else silly, like subsitute include/asm-generic/types.h for the now missing arch/arm/include/asm/types.h I wonder how many more headers are unintentionally exported. ... what a mess. :( -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 1/8] arm: put types.h in uapi 2017-01-13 16:01 ` Nicolas Dichtel ` (7 preceding siblings ...) (?) @ 2017-01-13 16:35 ` David Howells -1 siblings, 0 replies; 554+ messages in thread From: David Howells @ 2017-01-13 16:35 UTC (permalink / raw) To: Russell King - ARM Linux Cc: dhowells, Nicolas Dichtel, arnd, linux-arch, linux-kbuild, linux-kernel Russell King - ARM Linux <linux@armlinux.org.uk> wrote: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable > > Le 13/01/2017 =C3=A0 16:36, David Howells a =C3=A9crit : > > > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > > >=20 > > >> This header file is exported, thus move it to uapi. > > >=20 > > > Exported how? > >=20 > > It is listed in include/uapi/asm-generic/Kbuild.asm, which is included = by > > arch/arm/include/uapi/asm/Kbuild. >=20 > We really should not be installing non-uapi header files to userland > under _any_ circumstance - this to me sounds like a bug in kbuild. It's not (or was not) a bug exactly - it was something introduced in commit 10b63956fce7f369cc37fd4d994f09bd5203efe4 to ease the transition to using the UAPI headers as Linus required the commit for each header dir to go through the submaintainer's tree. It was supposed to be removed, but that never got posted to Linus because t= he next phase of cleanups didn't happen as Linus said he block my email and ne= ver take any more patches from me if I sent him any more:-/ David ^ permalink raw reply [flat|nested] 554+ messages in thread
* (no subject) 2017-01-13 10:46 ` Nicolas Dichtel ` (3 preceding siblings ...) (?) @ 2017-01-13 15:43 ` David Howells -1 siblings, 0 replies; 554+ messages in thread From: David Howells @ 2017-01-13 15:43 UTC (permalink / raw) To: Nicolas Dichtel Cc: dhowells, arnd, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arc > -header-y += msr-index.h I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at least four years - and as such it's part of the UAPI. I don't think you can remove it unless you can guarantee there are no userspace users. David ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] (no subject) @ 2017-01-13 15:43 ` David Howells 0 siblings, 0 replies; 554+ messages in thread From: David Howells @ 2017-01-13 15:43 UTC (permalink / raw) To: openrisc > -header-y += msr-index.h I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at least four years - and as such it's part of the UAPI. I don't think you can remove it unless you can guarantee there are no userspace users. David ^ permalink raw reply [flat|nested] 554+ messages in thread
* No subject @ 2017-01-13 15:43 ` David Howells 0 siblings, 0 replies; 554+ messages in thread From: David Howells @ 2017-01-13 15:43 UTC (permalink / raw) To: linux-snps-arc > -header-y += msr-index.h I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at least four years - and as such it's part of the UAPI. I don't think you can remove it unless you can guarantee there are no userspace users. David ^ permalink raw reply [flat|nested] 554+ messages in thread
* (no subject) @ 2017-01-13 15:43 ` David Howells 0 siblings, 0 replies; 554+ messages in thread From: David Howells @ 2017-01-13 15:43 UTC (permalink / raw) To: Nicolas Dichtel Cc: dhowells, arnd, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arc > -header-y += msr-index.h I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at least four years - and as such it's part of the UAPI. I don't think you can remove it unless you can guarantee there are no userspace users. David ^ permalink raw reply [flat|nested] 554+ messages in thread
* (no subject) @ 2017-01-13 15:43 ` David Howells 0 siblings, 0 replies; 554+ messages in thread From: David Howells @ 2017-01-13 15:43 UTC (permalink / raw) To: Nicolas Dichtel Cc: dhowells, arnd, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, linux > -header-y += msr-index.h I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at least four years - and as such it's part of the UAPI. I don't think you can remove it unless you can guarantee there are no userspace users. David ^ permalink raw reply [flat|nested] 554+ messages in thread
* (no subject) @ 2017-01-13 15:43 ` David Howells 0 siblings, 0 replies; 554+ messages in thread From: David Howells @ 2017-01-13 15:43 UTC (permalink / raw) To: Nicolas Dichtel Cc: dhowells, arnd, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, linux > -header-y += msr-index.h I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at least four years - and as such it's part of the UAPI. I don't think you can remove it unless you can guarantee there are no userspace users. David ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 4/8] x86: stop exporting msr-index.h to userland 2017-01-13 15:43 ` David Howells ` (4 preceding siblings ...) (?) @ 2017-01-13 16:08 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 16:08 UTC (permalink / raw) To: David Howells Cc: arnd, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch Le 13/01/2017 à 16:43, David Howells a écrit : >> -header-y += msr-index.h > > I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at > least four years - and as such it's part of the UAPI. I don't think you can > remove it unless you can guarantee there are no userspace users. I keep it in the v2 of the series, but the maintainer, Borislav Petkov, asks me to un-export it. I will follow the maintainer decision. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v3 4/8] x86: stop exporting msr-index.h to userland @ 2017-01-13 16:08 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 16:08 UTC (permalink / raw) To: openrisc Le 13/01/2017 à 16:43, David Howells a écrit : >> -header-y += msr-index.h > > I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at > least four years - and as such it's part of the UAPI. I don't think you can > remove it unless you can guarantee there are no userspace users. I keep it in the v2 of the series, but the maintainer, Borislav Petkov, asks me to un-export it. I will follow the maintainer decision. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 4/8] x86: stop exporting msr-index.h to userland @ 2017-01-13 16:08 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 16:08 UTC (permalink / raw) To: linux-arm-kernel Le 13/01/2017 ? 16:43, David Howells a ?crit : >> -header-y += msr-index.h > > I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at > least four years - and as such it's part of the UAPI. I don't think you can > remove it unless you can guarantee there are no userspace users. I keep it in the v2 of the series, but the maintainer, Borislav Petkov, asks me to un-export it. I will follow the maintainer decision. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 4/8] x86: stop exporting msr-index.h to userland @ 2017-01-13 16:08 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 16:08 UTC (permalink / raw) To: linux-snps-arc Le 13/01/2017 ? 16:43, David Howells a ?crit : >> -header-y += msr-index.h > > I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at > least four years - and as such it's part of the UAPI. I don't think you can > remove it unless you can guarantee there are no userspace users. I keep it in the v2 of the series, but the maintainer, Borislav Petkov, asks me to un-export it. I will follow the maintainer decision. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 4/8] x86: stop exporting msr-index.h to userland @ 2017-01-13 16:08 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 16:08 UTC (permalink / raw) To: David Howells Cc: arnd, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, linux, Borislav Petkov Le 13/01/2017 à 16:43, David Howells a écrit : >> -header-y += msr-index.h > > I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at > least four years - and as such it's part of the UAPI. I don't think you can > remove it unless you can guarantee there are no userspace users. I keep it in the v2 of the series, but the maintainer, Borislav Petkov, asks me to un-export it. I will follow the maintainer decision. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 4/8] x86: stop exporting msr-index.h to userland @ 2017-01-13 16:08 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 16:08 UTC (permalink / raw) To: David Howells Cc: arnd, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dr Le 13/01/2017 à 16:43, David Howells a écrit : >> -header-y += msr-index.h > > I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at > least four years - and as such it's part of the UAPI. I don't think you can > remove it unless you can guarantee there are no userspace users. I keep it in the v2 of the series, but the maintainer, Borislav Petkov, asks me to un-export it. I will follow the maintainer decision. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 4/8] x86: stop exporting msr-index.h to userland @ 2017-01-13 16:08 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 16:08 UTC (permalink / raw) To: David Howells Cc: arnd, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch Le 13/01/2017 à 16:43, David Howells a écrit : >> -header-y += msr-index.h > > I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at > least four years - and as such it's part of the UAPI. I don't think you can > remove it unless you can guarantee there are no userspace users. I keep it in the v2 of the series, but the maintainer, Borislav Petkov, asks me to un-export it. I will follow the maintainer decision. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 4/8] x86: stop exporting msr-index.h to userland 2017-01-13 16:08 ` Nicolas Dichtel ` (5 preceding siblings ...) (?) @ 2017-01-13 16:38 ` Borislav Petkov -1 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-13 16:38 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, linux-m68k, linux-ia64, linux-doc, alsa-devel, dri-devel, David Howells, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, openrisc, linux-fbdev On Fri, Jan 13, 2017 at 05:08:34PM +0100, Nicolas Dichtel wrote: > Le 13/01/2017 à 16:43, David Howells a écrit : > >> -header-y += msr-index.h > > > > I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at > > least four years - and as such it's part of the UAPI. I don't think you can > > remove it unless you can guarantee there are no userspace users. > I keep it in the v2 of the series, but the maintainer, Borislav Petkov, asks me > to un-export it. > > I will follow the maintainer decision. I'm not the maintainer. I simply think that exporting that file was wrong because it if we change something in it, we will break userspace. And that should not happen - if userspace needs MSRs, it should do its own defines. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 4/8] x86: stop exporting msr-index.h to userland 2017-01-13 16:08 ` Nicolas Dichtel ` (3 preceding siblings ...) (?) @ 2017-01-13 16:38 ` Borislav Petkov -1 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-13 16:38 UTC (permalink / raw) To: Nicolas Dichtel Cc: David Howells, arnd, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa On Fri, Jan 13, 2017 at 05:08:34PM +0100, Nicolas Dichtel wrote: > Le 13/01/2017 à 16:43, David Howells a écrit : > >> -header-y += msr-index.h > > > > I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at > > least four years - and as such it's part of the UAPI. I don't think you can > > remove it unless you can guarantee there are no userspace users. > I keep it in the v2 of the series, but the maintainer, Borislav Petkov, asks me > to un-export it. > > I will follow the maintainer decision. I'm not the maintainer. I simply think that exporting that file was wrong because it if we change something in it, we will break userspace. And that should not happen - if userspace needs MSRs, it should do its own defines. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [OpenRISC] [PATCH v3 4/8] x86: stop exporting msr-index.h to userland @ 2017-01-13 16:38 ` Borislav Petkov 0 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-13 16:38 UTC (permalink / raw) To: openrisc On Fri, Jan 13, 2017 at 05:08:34PM +0100, Nicolas Dichtel wrote: > Le 13/01/2017 à 16:43, David Howells a écrit : > >> -header-y += msr-index.h > > > > I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at > > least four years - and as such it's part of the UAPI. I don't think you can > > remove it unless you can guarantee there are no userspace users. > I keep it in the v2 of the series, but the maintainer, Borislav Petkov, asks me > to un-export it. > > I will follow the maintainer decision. I'm not the maintainer. I simply think that exporting that file was wrong because it if we change something in it, we will break userspace. And that should not happen - if userspace needs MSRs, it should do its own defines. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 4/8] x86: stop exporting msr-index.h to userland @ 2017-01-13 16:38 ` Borislav Petkov 0 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-13 16:38 UTC (permalink / raw) To: linux-arm-kernel On Fri, Jan 13, 2017 at 05:08:34PM +0100, Nicolas Dichtel wrote: > Le 13/01/2017 ? 16:43, David Howells a ?crit : > >> -header-y += msr-index.h > > > > I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at > > least four years - and as such it's part of the UAPI. I don't think you can > > remove it unless you can guarantee there are no userspace users. > I keep it in the v2 of the series, but the maintainer, Borislav Petkov, asks me > to un-export it. > > I will follow the maintainer decision. I'm not the maintainer. I simply think that exporting that file was wrong because it if we change something in it, we will break userspace. And that should not happen - if userspace needs MSRs, it should do its own defines. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 4/8] x86: stop exporting msr-index.h to userland @ 2017-01-13 16:38 ` Borislav Petkov 0 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-13 16:38 UTC (permalink / raw) To: linux-snps-arc On Fri, Jan 13, 2017@05:08:34PM +0100, Nicolas Dichtel wrote: > Le 13/01/2017 ? 16:43, David Howells a ?crit : > >> -header-y += msr-index.h > > > > I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at > > least four years - and as such it's part of the UAPI. I don't think you can > > remove it unless you can guarantee there are no userspace users. > I keep it in the v2 of the series, but the maintainer, Borislav Petkov, asks me > to un-export it. > > I will follow the maintainer decision. I'm not the maintainer. I simply think that exporting that file was wrong because it if we change something in it, we will break userspace. And that should not happen - if userspace needs MSRs, it should do its own defines. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 4/8] x86: stop exporting msr-index.h to userland @ 2017-01-13 16:38 ` Borislav Petkov 0 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-13 16:38 UTC (permalink / raw) To: Nicolas Dichtel Cc: David Howells, arnd, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch, dri-devel, netdev, linux-media, linux-mmc, netfilter-devel, coreteam, linux-nfs, linux-raid, linux-spi, linux-mtd, linux-rdma, fcoe-devel, alsa-devel, linux-fbdev, xen-devel, linux On Fri, Jan 13, 2017 at 05:08:34PM +0100, Nicolas Dichtel wrote: > Le 13/01/2017 à 16:43, David Howells a écrit : > >> -header-y += msr-index.h > > > > I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at > > least four years - and as such it's part of the UAPI. I don't think you can > > remove it unless you can guarantee there are no userspace users. > I keep it in the v2 of the series, but the maintainer, Borislav Petkov, asks me > to un-export it. > > I will follow the maintainer decision. I'm not the maintainer. I simply think that exporting that file was wrong because it if we change something in it, we will break userspace. And that should not happen - if userspace needs MSRs, it should do its own defines. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 4/8] x86: stop exporting msr-index.h to userland @ 2017-01-13 16:38 ` Borislav Petkov 0 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-13 16:38 UTC (permalink / raw) To: Nicolas Dichtel Cc: David Howells, arnd, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa On Fri, Jan 13, 2017 at 05:08:34PM +0100, Nicolas Dichtel wrote: > Le 13/01/2017 à 16:43, David Howells a écrit : > >> -header-y += msr-index.h > > > > I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at > > least four years - and as such it's part of the UAPI. I don't think you can > > remove it unless you can guarantee there are no userspace users. > I keep it in the v2 of the series, but the maintainer, Borislav Petkov, asks me > to un-export it. > > I will follow the maintainer decision. I'm not the maintainer. I simply think that exporting that file was wrong because it if we change something in it, we will break userspace. And that should not happen - if userspace needs MSRs, it should do its own defines. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v3 4/8] x86: stop exporting msr-index.h to userland 2017-01-13 15:43 ` David Howells ` (5 preceding siblings ...) (?) @ 2017-01-13 16:08 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 16:08 UTC (permalink / raw) To: David Howells Cc: linux-mips, linux-m68k, linux-ia64, linux-doc, alsa-devel, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, openrisc, Borislav Petkov, linux-fbdev Le 13/01/2017 à 16:43, David Howells a écrit : >> -header-y += msr-index.h > > I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at > least four years - and as such it's part of the UAPI. I don't think you can > remove it unless you can guarantee there are no userspace users. I keep it in the v2 of the series, but the maintainer, Borislav Petkov, asks me to un-export it. I will follow the maintainer decision. Regards, Nicolas _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* (no subject) 2017-01-13 10:46 ` Nicolas Dichtel ` (26 preceding siblings ...) (?) @ 2017-01-13 15:43 ` David Howells -1 siblings, 0 replies; 554+ messages in thread From: David Howells @ 2017-01-13 15:43 UTC (permalink / raw) To: Nicolas Dichtel Cc: linux-mips, linux-m68k, linux-ia64, linux-doc, alsa-devel, dri-devel, dhowells, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, arnd, linux-kbuild, adi-buildroot-devel, linux-raid, openrisc, linux-fbdev, linux-metag > -header-y += msr-index.h I see it on my desktop as /usr/include/asm/msr-index.h and it's been there at least four years - and as such it's part of the UAPI. I don't think you can remove it unless you can guarantee there are no userspace users. David _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v4 0/7] uapi: export all headers under uapi directories 2017-01-13 10:46 ` Nicolas Dichtel ` (27 preceding siblings ...) (?) @ 2017-01-23 14:58 ` Nicolas Dichtel 2017-01-23 14:58 ` [PATCH v4 1/7] h8300: put bitsperlong.h in uapi Nicolas Dichtel ` (6 more replies) -1 siblings, 7 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-23 14:58 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe Here is the v4 of this series. Seems there was too many people cc'ed, so I've removed arch specific ml. Hope it's better now. Patches #1 to #4 are just cleanup: some exported headers were still under a non-uapi directory. The patch #5 was spotted by code review: there is no in-tree user of this functionality. Patches #6 and #7 remove the need to list explicitly headers. Now all files under an uapi directory are exported. This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. If I must rebase it against the kbuild tree, just tell me. v3 -> v4: - first patch has been included - patch #4: get back to v2 and remove arch/x86/include/asm/msr-index.h v2 -> v3: - patch #1: remove arch/arm/include/asm/types.h - patch #2: remove arch/h8300/include/asm/bitsperlong.h - patch #3: remove arch/nios2/include/uapi/asm/setup.h - patch #4: don't export msr-index.h - patch #5: fix a typo: s/unput-files3-name/input-files3-name - patch #6: no change - patch #7: fix include/uapi/asm-generic/Kbuild.asm by introducing mandatory-y - add patch #8 v1 -> v2: - add patch #1 to #6 - patch #7: remove use of header-y Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v4 1/7] h8300: put bitsperlong.h in uapi 2017-01-23 14:58 ` [PATCH v4 0/7] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-01-23 14:58 ` Nicolas Dichtel 2017-01-23 14:58 ` [PATCH v4 2/7] nios2: put setup.h " Nicolas Dichtel ` (5 subsequent siblings) 6 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-23 14:58 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 14 -------------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h deleted file mode 100644 index e140e46729ac..000000000000 --- a/arch/h8300/include/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __ASM_H8300_BITS_PER_LONG -#define __ASM_H8300_BITS_PER_LONG - -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif - -#endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v4 2/7] nios2: put setup.h in uapi 2017-01-23 14:58 ` [PATCH v4 0/7] uapi: export all headers under uapi directories Nicolas Dichtel 2017-01-23 14:58 ` [PATCH v4 1/7] h8300: put bitsperlong.h in uapi Nicolas Dichtel @ 2017-01-23 14:58 ` Nicolas Dichtel 2017-01-23 14:58 ` [PATCH v4 3/7] x86: put msr-index.h " Nicolas Dichtel ` (4 subsequent siblings) 6 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-23 14:58 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, Nicolas Dichtel This header file is exported, but from a userland pov, it's just a wrapper to asm-generic/setup.h. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: Tobias Klauser <tklauser@distanz.ch> --- arch/nios2/include/uapi/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..69c965304146 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -2,4 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h +generic-y += setup.h generic-y += ucontext.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v4 3/7] x86: put msr-index.h in uapi 2017-01-23 14:58 ` [PATCH v4 0/7] uapi: export all headers under uapi directories Nicolas Dichtel 2017-01-23 14:58 ` [PATCH v4 1/7] h8300: put bitsperlong.h in uapi Nicolas Dichtel 2017-01-23 14:58 ` [PATCH v4 2/7] nios2: put setup.h " Nicolas Dichtel @ 2017-01-23 14:58 ` Nicolas Dichtel 2017-01-23 16:52 ` Borislav Petkov ` (3 more replies) 2017-01-23 14:58 ` [PATCH v4 4/7] Makefile.headersinst: cleanup input files Nicolas Dichtel ` (3 subsequent siblings) 6 siblings, 4 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-23 14:58 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/x86/include/asm/msr-index.h | 698 ---------------------------------- arch/x86/include/uapi/asm/msr-index.h | 698 ++++++++++++++++++++++++++++++++++ 2 files changed, 698 insertions(+), 698 deletions(-) delete mode 100644 arch/x86/include/asm/msr-index.h create mode 100644 arch/x86/include/uapi/asm/msr-index.h diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h deleted file mode 100644 index 710273c617b8..000000000000 --- a/arch/x86/include/asm/msr-index.h +++ /dev/null @@ -1,698 +0,0 @@ -#ifndef _ASM_X86_MSR_INDEX_H -#define _ASM_X86_MSR_INDEX_H - -/* - * CPU model specific register (MSR) numbers. - * - * Do not add new entries to this file unless the definitions are shared - * between multiple compilation units. - */ - -/* x86-64 specific MSRs */ -#define MSR_EFER 0xc0000080 /* extended feature register */ -#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ -#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ -#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ -#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ -#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ -#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ -#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ -#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ - -/* EFER bits: */ -#define _EFER_SCE 0 /* SYSCALL/SYSRET */ -#define _EFER_LME 8 /* Long mode enable */ -#define _EFER_LMA 10 /* Long mode active (read-only) */ -#define _EFER_NX 11 /* No execute enable */ -#define _EFER_SVME 12 /* Enable virtualization */ -#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ -#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ - -#define EFER_SCE (1<<_EFER_SCE) -#define EFER_LME (1<<_EFER_LME) -#define EFER_LMA (1<<_EFER_LMA) -#define EFER_NX (1<<_EFER_NX) -#define EFER_SVME (1<<_EFER_SVME) -#define EFER_LMSLE (1<<_EFER_LMSLE) -#define EFER_FFXSR (1<<_EFER_FFXSR) - -/* Intel MSRs. Some also available on other CPUs */ - -#define MSR_PPIN_CTL 0x0000004e -#define MSR_PPIN 0x0000004f - -#define MSR_IA32_PERFCTR0 0x000000c1 -#define MSR_IA32_PERFCTR1 0x000000c2 -#define MSR_FSB_FREQ 0x000000cd -#define MSR_PLATFORM_INFO 0x000000ce - -#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 -#define NHM_C3_AUTO_DEMOTE (1UL << 25) -#define NHM_C1_AUTO_DEMOTE (1UL << 26) -#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) -#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) -#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) - -#define MSR_MTRRcap 0x000000fe -#define MSR_IA32_BBL_CR_CTL 0x00000119 -#define MSR_IA32_BBL_CR_CTL3 0x0000011e - -#define MSR_IA32_SYSENTER_CS 0x00000174 -#define MSR_IA32_SYSENTER_ESP 0x00000175 -#define MSR_IA32_SYSENTER_EIP 0x00000176 - -#define MSR_IA32_MCG_CAP 0x00000179 -#define MSR_IA32_MCG_STATUS 0x0000017a -#define MSR_IA32_MCG_CTL 0x0000017b -#define MSR_IA32_MCG_EXT_CTL 0x000004d0 - -#define MSR_OFFCORE_RSP_0 0x000001a6 -#define MSR_OFFCORE_RSP_1 0x000001a7 -#define MSR_TURBO_RATIO_LIMIT 0x000001ad -#define MSR_TURBO_RATIO_LIMIT1 0x000001ae -#define MSR_TURBO_RATIO_LIMIT2 0x000001af - -#define MSR_LBR_SELECT 0x000001c8 -#define MSR_LBR_TOS 0x000001c9 -#define MSR_LBR_NHM_FROM 0x00000680 -#define MSR_LBR_NHM_TO 0x000006c0 -#define MSR_LBR_CORE_FROM 0x00000040 -#define MSR_LBR_CORE_TO 0x00000060 - -#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ -#define LBR_INFO_MISPRED BIT_ULL(63) -#define LBR_INFO_IN_TX BIT_ULL(62) -#define LBR_INFO_ABORT BIT_ULL(61) -#define LBR_INFO_CYCLES 0xffff - -#define MSR_IA32_PEBS_ENABLE 0x000003f1 -#define MSR_IA32_DS_AREA 0x00000600 -#define MSR_IA32_PERF_CAPABILITIES 0x00000345 -#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 - -#define MSR_IA32_RTIT_CTL 0x00000570 -#define MSR_IA32_RTIT_STATUS 0x00000571 -#define MSR_IA32_RTIT_ADDR0_A 0x00000580 -#define MSR_IA32_RTIT_ADDR0_B 0x00000581 -#define MSR_IA32_RTIT_ADDR1_A 0x00000582 -#define MSR_IA32_RTIT_ADDR1_B 0x00000583 -#define MSR_IA32_RTIT_ADDR2_A 0x00000584 -#define MSR_IA32_RTIT_ADDR2_B 0x00000585 -#define MSR_IA32_RTIT_ADDR3_A 0x00000586 -#define MSR_IA32_RTIT_ADDR3_B 0x00000587 -#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 -#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 -#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 - -#define MSR_MTRRfix64K_00000 0x00000250 -#define MSR_MTRRfix16K_80000 0x00000258 -#define MSR_MTRRfix16K_A0000 0x00000259 -#define MSR_MTRRfix4K_C0000 0x00000268 -#define MSR_MTRRfix4K_C8000 0x00000269 -#define MSR_MTRRfix4K_D0000 0x0000026a -#define MSR_MTRRfix4K_D8000 0x0000026b -#define MSR_MTRRfix4K_E0000 0x0000026c -#define MSR_MTRRfix4K_E8000 0x0000026d -#define MSR_MTRRfix4K_F0000 0x0000026e -#define MSR_MTRRfix4K_F8000 0x0000026f -#define MSR_MTRRdefType 0x000002ff - -#define MSR_IA32_CR_PAT 0x00000277 - -#define MSR_IA32_DEBUGCTLMSR 0x000001d9 -#define MSR_IA32_LASTBRANCHFROMIP 0x000001db -#define MSR_IA32_LASTBRANCHTOIP 0x000001dc -#define MSR_IA32_LASTINTFROMIP 0x000001dd -#define MSR_IA32_LASTINTTOIP 0x000001de - -/* DEBUGCTLMSR bits (others vary by model): */ -#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ -#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ -#define DEBUGCTLMSR_TR (1UL << 6) -#define DEBUGCTLMSR_BTS (1UL << 7) -#define DEBUGCTLMSR_BTINT (1UL << 8) -#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) -#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) -#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) - -#define MSR_PEBS_FRONTEND 0x000003f7 - -#define MSR_IA32_POWER_CTL 0x000001fc - -#define MSR_IA32_MC0_CTL 0x00000400 -#define MSR_IA32_MC0_STATUS 0x00000401 -#define MSR_IA32_MC0_ADDR 0x00000402 -#define MSR_IA32_MC0_MISC 0x00000403 - -/* C-state Residency Counters */ -#define MSR_PKG_C3_RESIDENCY 0x000003f8 -#define MSR_PKG_C6_RESIDENCY 0x000003f9 -#define MSR_PKG_C7_RESIDENCY 0x000003fa -#define MSR_CORE_C3_RESIDENCY 0x000003fc -#define MSR_CORE_C6_RESIDENCY 0x000003fd -#define MSR_CORE_C7_RESIDENCY 0x000003fe -#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff -#define MSR_PKG_C2_RESIDENCY 0x0000060d -#define MSR_PKG_C8_RESIDENCY 0x00000630 -#define MSR_PKG_C9_RESIDENCY 0x00000631 -#define MSR_PKG_C10_RESIDENCY 0x00000632 - -/* Interrupt Response Limit */ -#define MSR_PKGC3_IRTL 0x0000060a -#define MSR_PKGC6_IRTL 0x0000060b -#define MSR_PKGC7_IRTL 0x0000060c -#define MSR_PKGC8_IRTL 0x00000633 -#define MSR_PKGC9_IRTL 0x00000634 -#define MSR_PKGC10_IRTL 0x00000635 - -/* Run Time Average Power Limiting (RAPL) Interface */ - -#define MSR_RAPL_POWER_UNIT 0x00000606 - -#define MSR_PKG_POWER_LIMIT 0x00000610 -#define MSR_PKG_ENERGY_STATUS 0x00000611 -#define MSR_PKG_PERF_STATUS 0x00000613 -#define MSR_PKG_POWER_INFO 0x00000614 - -#define MSR_DRAM_POWER_LIMIT 0x00000618 -#define MSR_DRAM_ENERGY_STATUS 0x00000619 -#define MSR_DRAM_PERF_STATUS 0x0000061b -#define MSR_DRAM_POWER_INFO 0x0000061c - -#define MSR_PP0_POWER_LIMIT 0x00000638 -#define MSR_PP0_ENERGY_STATUS 0x00000639 -#define MSR_PP0_POLICY 0x0000063a -#define MSR_PP0_PERF_STATUS 0x0000063b - -#define MSR_PP1_POWER_LIMIT 0x00000640 -#define MSR_PP1_ENERGY_STATUS 0x00000641 -#define MSR_PP1_POLICY 0x00000642 - -/* Config TDP MSRs */ -#define MSR_CONFIG_TDP_NOMINAL 0x00000648 -#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 -#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A -#define MSR_CONFIG_TDP_CONTROL 0x0000064B -#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C - -#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D - -#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 -#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 -#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A -#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B - -#define MSR_CORE_C1_RES 0x00000660 - -#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 -#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 - -#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 -#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 -#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 - -/* Hardware P state interface */ -#define MSR_PPERF 0x0000064e -#define MSR_PERF_LIMIT_REASONS 0x0000064f -#define MSR_PM_ENABLE 0x00000770 -#define MSR_HWP_CAPABILITIES 0x00000771 -#define MSR_HWP_REQUEST_PKG 0x00000772 -#define MSR_HWP_INTERRUPT 0x00000773 -#define MSR_HWP_REQUEST 0x00000774 -#define MSR_HWP_STATUS 0x00000777 - -/* CPUID.6.EAX */ -#define HWP_BASE_BIT (1<<7) -#define HWP_NOTIFICATIONS_BIT (1<<8) -#define HWP_ACTIVITY_WINDOW_BIT (1<<9) -#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) -#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) - -/* IA32_HWP_CAPABILITIES */ -#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) -#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) -#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) -#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) - -/* IA32_HWP_REQUEST */ -#define HWP_MIN_PERF(x) (x & 0xff) -#define HWP_MAX_PERF(x) ((x & 0xff) << 8) -#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) -#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) -#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) -#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) - -/* IA32_HWP_STATUS */ -#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) - -/* IA32_HWP_INTERRUPT */ -#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) -#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) - -#define MSR_AMD64_MC0_MASK 0xc0010044 - -#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) -#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) -#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) -#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) - -#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) - -/* These are consecutive and not in the normal 4er MCE bank block */ -#define MSR_IA32_MC0_CTL2 0x00000280 -#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) - -#define MSR_P6_PERFCTR0 0x000000c1 -#define MSR_P6_PERFCTR1 0x000000c2 -#define MSR_P6_EVNTSEL0 0x00000186 -#define MSR_P6_EVNTSEL1 0x00000187 - -#define MSR_KNC_PERFCTR0 0x00000020 -#define MSR_KNC_PERFCTR1 0x00000021 -#define MSR_KNC_EVNTSEL0 0x00000028 -#define MSR_KNC_EVNTSEL1 0x00000029 - -/* Alternative perfctr range with full access. */ -#define MSR_IA32_PMC0 0x000004c1 - -/* AMD64 MSRs. Not complete. See the architecture manual for a more - complete list. */ - -#define MSR_AMD64_PATCH_LEVEL 0x0000008b -#define MSR_AMD64_TSC_RATIO 0xc0000104 -#define MSR_AMD64_NB_CFG 0xc001001f -#define MSR_AMD64_PATCH_LOADER 0xc0010020 -#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 -#define MSR_AMD64_OSVW_STATUS 0xc0010141 -#define MSR_AMD64_LS_CFG 0xc0011020 -#define MSR_AMD64_DC_CFG 0xc0011022 -#define MSR_AMD64_BU_CFG2 0xc001102a -#define MSR_AMD64_IBSFETCHCTL 0xc0011030 -#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 -#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 -#define MSR_AMD64_IBSFETCH_REG_COUNT 3 -#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) -#define MSR_AMD64_IBSOPCTL 0xc0011033 -#define MSR_AMD64_IBSOPRIP 0xc0011034 -#define MSR_AMD64_IBSOPDATA 0xc0011035 -#define MSR_AMD64_IBSOPDATA2 0xc0011036 -#define MSR_AMD64_IBSOPDATA3 0xc0011037 -#define MSR_AMD64_IBSDCLINAD 0xc0011038 -#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 -#define MSR_AMD64_IBSOP_REG_COUNT 7 -#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) -#define MSR_AMD64_IBSCTL 0xc001103a -#define MSR_AMD64_IBSBRTARGET 0xc001103b -#define MSR_AMD64_IBSOPDATA4 0xc001103d -#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ - -/* Fam 17h MSRs */ -#define MSR_F17H_IRPERF 0xc00000e9 - -/* Fam 16h MSRs */ -#define MSR_F16H_L2I_PERF_CTL 0xc0010230 -#define MSR_F16H_L2I_PERF_CTR 0xc0010231 -#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 -#define MSR_F16H_DR2_ADDR_MASK 0xc001101a -#define MSR_F16H_DR3_ADDR_MASK 0xc001101b -#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 - -/* Fam 15h MSRs */ -#define MSR_F15H_PERF_CTL 0xc0010200 -#define MSR_F15H_PERF_CTR 0xc0010201 -#define MSR_F15H_NB_PERF_CTL 0xc0010240 -#define MSR_F15H_NB_PERF_CTR 0xc0010241 -#define MSR_F15H_PTSC 0xc0010280 -#define MSR_F15H_IC_CFG 0xc0011021 - -/* Fam 10h MSRs */ -#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 -#define FAM10H_MMIO_CONF_ENABLE (1<<0) -#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf -#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 -#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL -#define FAM10H_MMIO_CONF_BASE_SHIFT 20 -#define MSR_FAM10H_NODE_ID 0xc001100c - -/* K8 MSRs */ -#define MSR_K8_TOP_MEM1 0xc001001a -#define MSR_K8_TOP_MEM2 0xc001001d -#define MSR_K8_SYSCFG 0xc0010010 -#define MSR_K8_INT_PENDING_MSG 0xc0010055 -/* C1E active bits in int pending message */ -#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 -#define MSR_K8_TSEG_ADDR 0xc0010112 -#define MSR_K8_TSEG_MASK 0xc0010113 -#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ -#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ -#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ - -/* K7 MSRs */ -#define MSR_K7_EVNTSEL0 0xc0010000 -#define MSR_K7_PERFCTR0 0xc0010004 -#define MSR_K7_EVNTSEL1 0xc0010001 -#define MSR_K7_PERFCTR1 0xc0010005 -#define MSR_K7_EVNTSEL2 0xc0010002 -#define MSR_K7_PERFCTR2 0xc0010006 -#define MSR_K7_EVNTSEL3 0xc0010003 -#define MSR_K7_PERFCTR3 0xc0010007 -#define MSR_K7_CLK_CTL 0xc001001b -#define MSR_K7_HWCR 0xc0010015 -#define MSR_K7_FID_VID_CTL 0xc0010041 -#define MSR_K7_FID_VID_STATUS 0xc0010042 - -/* K6 MSRs */ -#define MSR_K6_WHCR 0xc0000082 -#define MSR_K6_UWCCR 0xc0000085 -#define MSR_K6_EPMR 0xc0000086 -#define MSR_K6_PSOR 0xc0000087 -#define MSR_K6_PFIR 0xc0000088 - -/* Centaur-Hauls/IDT defined MSRs. */ -#define MSR_IDT_FCR1 0x00000107 -#define MSR_IDT_FCR2 0x00000108 -#define MSR_IDT_FCR3 0x00000109 -#define MSR_IDT_FCR4 0x0000010a - -#define MSR_IDT_MCR0 0x00000110 -#define MSR_IDT_MCR1 0x00000111 -#define MSR_IDT_MCR2 0x00000112 -#define MSR_IDT_MCR3 0x00000113 -#define MSR_IDT_MCR4 0x00000114 -#define MSR_IDT_MCR5 0x00000115 -#define MSR_IDT_MCR6 0x00000116 -#define MSR_IDT_MCR7 0x00000117 -#define MSR_IDT_MCR_CTRL 0x00000120 - -/* VIA Cyrix defined MSRs*/ -#define MSR_VIA_FCR 0x00001107 -#define MSR_VIA_LONGHAUL 0x0000110a -#define MSR_VIA_RNG 0x0000110b -#define MSR_VIA_BCR2 0x00001147 - -/* Transmeta defined MSRs */ -#define MSR_TMTA_LONGRUN_CTRL 0x80868010 -#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 -#define MSR_TMTA_LRTI_READOUT 0x80868018 -#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a - -/* Intel defined MSRs. */ -#define MSR_IA32_P5_MC_ADDR 0x00000000 -#define MSR_IA32_P5_MC_TYPE 0x00000001 -#define MSR_IA32_TSC 0x00000010 -#define MSR_IA32_PLATFORM_ID 0x00000017 -#define MSR_IA32_EBL_CR_POWERON 0x0000002a -#define MSR_EBC_FREQUENCY_ID 0x0000002c -#define MSR_SMI_COUNT 0x00000034 -#define MSR_IA32_FEATURE_CONTROL 0x0000003a -#define MSR_IA32_TSC_ADJUST 0x0000003b -#define MSR_IA32_BNDCFGS 0x00000d90 - -#define MSR_IA32_XSS 0x00000da0 - -#define FEATURE_CONTROL_LOCKED (1<<0) -#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) -#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) -#define FEATURE_CONTROL_LMCE (1<<20) - -#define MSR_IA32_APICBASE 0x0000001b -#define MSR_IA32_APICBASE_BSP (1<<8) -#define MSR_IA32_APICBASE_ENABLE (1<<11) -#define MSR_IA32_APICBASE_BASE (0xfffff<<12) - -#define MSR_IA32_TSCDEADLINE 0x000006e0 - -#define MSR_IA32_UCODE_WRITE 0x00000079 -#define MSR_IA32_UCODE_REV 0x0000008b - -#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b -#define MSR_IA32_SMBASE 0x0000009e - -#define MSR_IA32_PERF_STATUS 0x00000198 -#define MSR_IA32_PERF_CTL 0x00000199 -#define INTEL_PERF_CTL_MASK 0xffff -#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 -#define MSR_AMD_PERF_STATUS 0xc0010063 -#define MSR_AMD_PERF_CTL 0xc0010062 - -#define MSR_IA32_MPERF 0x000000e7 -#define MSR_IA32_APERF 0x000000e8 - -#define MSR_IA32_THERM_CONTROL 0x0000019a -#define MSR_IA32_THERM_INTERRUPT 0x0000019b - -#define THERM_INT_HIGH_ENABLE (1 << 0) -#define THERM_INT_LOW_ENABLE (1 << 1) -#define THERM_INT_PLN_ENABLE (1 << 24) - -#define MSR_IA32_THERM_STATUS 0x0000019c - -#define THERM_STATUS_PROCHOT (1 << 0) -#define THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_THERM2_CTL 0x0000019d - -#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) - -#define MSR_IA32_MISC_ENABLE 0x000001a0 - -#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 - -#define MSR_MISC_PWR_MGMT 0x000001aa - -#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 -#define ENERGY_PERF_BIAS_PERFORMANCE 0 -#define ENERGY_PERF_BIAS_NORMAL 6 -#define ENERGY_PERF_BIAS_POWERSAVE 15 - -#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 - -#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) -#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) - -#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 - -#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) -#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) -#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) - -/* Thermal Thresholds Support */ -#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) -#define THERM_SHIFT_THRESHOLD0 8 -#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) -#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) -#define THERM_SHIFT_THRESHOLD1 16 -#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) -#define THERM_STATUS_THRESHOLD0 (1 << 6) -#define THERM_LOG_THRESHOLD0 (1 << 7) -#define THERM_STATUS_THRESHOLD1 (1 << 8) -#define THERM_LOG_THRESHOLD1 (1 << 9) - -/* MISC_ENABLE bits: architectural */ -#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 -#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) -#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 -#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) -#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 -#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 -#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 -#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 -#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) -#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 -#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 -#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 -#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 -#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) - -/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ -#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 -#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) -#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 -#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 -#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 -#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 -#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 -#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 -#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) -#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 -#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 -#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 -#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 -#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 -#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 -#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 -#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) - -#define MSR_IA32_TSC_DEADLINE 0x000006E0 - -/* P4/Xeon+ specific */ -#define MSR_IA32_MCG_EAX 0x00000180 -#define MSR_IA32_MCG_EBX 0x00000181 -#define MSR_IA32_MCG_ECX 0x00000182 -#define MSR_IA32_MCG_EDX 0x00000183 -#define MSR_IA32_MCG_ESI 0x00000184 -#define MSR_IA32_MCG_EDI 0x00000185 -#define MSR_IA32_MCG_EBP 0x00000186 -#define MSR_IA32_MCG_ESP 0x00000187 -#define MSR_IA32_MCG_EFLAGS 0x00000188 -#define MSR_IA32_MCG_EIP 0x00000189 -#define MSR_IA32_MCG_RESERVED 0x0000018a - -/* Pentium IV performance counter MSRs */ -#define MSR_P4_BPU_PERFCTR0 0x00000300 -#define MSR_P4_BPU_PERFCTR1 0x00000301 -#define MSR_P4_BPU_PERFCTR2 0x00000302 -#define MSR_P4_BPU_PERFCTR3 0x00000303 -#define MSR_P4_MS_PERFCTR0 0x00000304 -#define MSR_P4_MS_PERFCTR1 0x00000305 -#define MSR_P4_MS_PERFCTR2 0x00000306 -#define MSR_P4_MS_PERFCTR3 0x00000307 -#define MSR_P4_FLAME_PERFCTR0 0x00000308 -#define MSR_P4_FLAME_PERFCTR1 0x00000309 -#define MSR_P4_FLAME_PERFCTR2 0x0000030a -#define MSR_P4_FLAME_PERFCTR3 0x0000030b -#define MSR_P4_IQ_PERFCTR0 0x0000030c -#define MSR_P4_IQ_PERFCTR1 0x0000030d -#define MSR_P4_IQ_PERFCTR2 0x0000030e -#define MSR_P4_IQ_PERFCTR3 0x0000030f -#define MSR_P4_IQ_PERFCTR4 0x00000310 -#define MSR_P4_IQ_PERFCTR5 0x00000311 -#define MSR_P4_BPU_CCCR0 0x00000360 -#define MSR_P4_BPU_CCCR1 0x00000361 -#define MSR_P4_BPU_CCCR2 0x00000362 -#define MSR_P4_BPU_CCCR3 0x00000363 -#define MSR_P4_MS_CCCR0 0x00000364 -#define MSR_P4_MS_CCCR1 0x00000365 -#define MSR_P4_MS_CCCR2 0x00000366 -#define MSR_P4_MS_CCCR3 0x00000367 -#define MSR_P4_FLAME_CCCR0 0x00000368 -#define MSR_P4_FLAME_CCCR1 0x00000369 -#define MSR_P4_FLAME_CCCR2 0x0000036a -#define MSR_P4_FLAME_CCCR3 0x0000036b -#define MSR_P4_IQ_CCCR0 0x0000036c -#define MSR_P4_IQ_CCCR1 0x0000036d -#define MSR_P4_IQ_CCCR2 0x0000036e -#define MSR_P4_IQ_CCCR3 0x0000036f -#define MSR_P4_IQ_CCCR4 0x00000370 -#define MSR_P4_IQ_CCCR5 0x00000371 -#define MSR_P4_ALF_ESCR0 0x000003ca -#define MSR_P4_ALF_ESCR1 0x000003cb -#define MSR_P4_BPU_ESCR0 0x000003b2 -#define MSR_P4_BPU_ESCR1 0x000003b3 -#define MSR_P4_BSU_ESCR0 0x000003a0 -#define MSR_P4_BSU_ESCR1 0x000003a1 -#define MSR_P4_CRU_ESCR0 0x000003b8 -#define MSR_P4_CRU_ESCR1 0x000003b9 -#define MSR_P4_CRU_ESCR2 0x000003cc -#define MSR_P4_CRU_ESCR3 0x000003cd -#define MSR_P4_CRU_ESCR4 0x000003e0 -#define MSR_P4_CRU_ESCR5 0x000003e1 -#define MSR_P4_DAC_ESCR0 0x000003a8 -#define MSR_P4_DAC_ESCR1 0x000003a9 -#define MSR_P4_FIRM_ESCR0 0x000003a4 -#define MSR_P4_FIRM_ESCR1 0x000003a5 -#define MSR_P4_FLAME_ESCR0 0x000003a6 -#define MSR_P4_FLAME_ESCR1 0x000003a7 -#define MSR_P4_FSB_ESCR0 0x000003a2 -#define MSR_P4_FSB_ESCR1 0x000003a3 -#define MSR_P4_IQ_ESCR0 0x000003ba -#define MSR_P4_IQ_ESCR1 0x000003bb -#define MSR_P4_IS_ESCR0 0x000003b4 -#define MSR_P4_IS_ESCR1 0x000003b5 -#define MSR_P4_ITLB_ESCR0 0x000003b6 -#define MSR_P4_ITLB_ESCR1 0x000003b7 -#define MSR_P4_IX_ESCR0 0x000003c8 -#define MSR_P4_IX_ESCR1 0x000003c9 -#define MSR_P4_MOB_ESCR0 0x000003aa -#define MSR_P4_MOB_ESCR1 0x000003ab -#define MSR_P4_MS_ESCR0 0x000003c0 -#define MSR_P4_MS_ESCR1 0x000003c1 -#define MSR_P4_PMH_ESCR0 0x000003ac -#define MSR_P4_PMH_ESCR1 0x000003ad -#define MSR_P4_RAT_ESCR0 0x000003bc -#define MSR_P4_RAT_ESCR1 0x000003bd -#define MSR_P4_SAAT_ESCR0 0x000003ae -#define MSR_P4_SAAT_ESCR1 0x000003af -#define MSR_P4_SSU_ESCR0 0x000003be -#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ - -#define MSR_P4_TBPU_ESCR0 0x000003c2 -#define MSR_P4_TBPU_ESCR1 0x000003c3 -#define MSR_P4_TC_ESCR0 0x000003c4 -#define MSR_P4_TC_ESCR1 0x000003c5 -#define MSR_P4_U2L_ESCR0 0x000003b0 -#define MSR_P4_U2L_ESCR1 0x000003b1 - -#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 - -/* Intel Core-based CPU performance counters */ -#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 -#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a -#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b -#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d -#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e -#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f -#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 - -/* Geode defined MSRs */ -#define MSR_GEODE_BUSCONT_CONF0 0x00001900 - -/* Intel VT MSRs */ -#define MSR_IA32_VMX_BASIC 0x00000480 -#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 -#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 -#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 -#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 -#define MSR_IA32_VMX_MISC 0x00000485 -#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 -#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 -#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 -#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 -#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a -#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b -#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c -#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d -#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e -#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f -#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 -#define MSR_IA32_VMX_VMFUNC 0x00000491 - -/* VMX_BASIC bits and bitmasks */ -#define VMX_BASIC_VMCS_SIZE_SHIFT 32 -#define VMX_BASIC_TRUE_CTLS (1ULL << 55) -#define VMX_BASIC_64 0x0001000000000000LLU -#define VMX_BASIC_MEM_TYPE_SHIFT 50 -#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU -#define VMX_BASIC_MEM_TYPE_WB 6LLU -#define VMX_BASIC_INOUT 0x0040000000000000LLU - -/* MSR_IA32_VMX_MISC bits */ -#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) -#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F -/* AMD-V MSRs */ - -#define MSR_VM_CR 0xc0010114 -#define MSR_VM_IGNNE 0xc0010115 -#define MSR_VM_HSAVE_PA 0xc0010117 - -#endif /* _ASM_X86_MSR_INDEX_H */ diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h new file mode 100644 index 000000000000..d097e832ee3c --- /dev/null +++ b/arch/x86/include/uapi/asm/msr-index.h @@ -0,0 +1,698 @@ +#ifndef _UAPI_ASM_X86_MSR_INDEX_H +#define _UAPI_ASM_X86_MSR_INDEX_H + +/* + * CPU model specific register (MSR) numbers. + * + * Do not add new entries to this file unless the definitions are shared + * between multiple compilation units. + */ + +/* x86-64 specific MSRs */ +#define MSR_EFER 0xc0000080 /* extended feature register */ +#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ +#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ +#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target */ +#define MSR_SYSCALL_MASK 0xc0000084 /* EFLAGS mask for syscall */ +#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */ +#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */ +#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */ +#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */ + +/* EFER bits: */ +#define _EFER_SCE 0 /* SYSCALL/SYSRET */ +#define _EFER_LME 8 /* Long mode enable */ +#define _EFER_LMA 10 /* Long mode active (read-only) */ +#define _EFER_NX 11 /* No execute enable */ +#define _EFER_SVME 12 /* Enable virtualization */ +#define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ +#define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ + +#define EFER_SCE (1<<_EFER_SCE) +#define EFER_LME (1<<_EFER_LME) +#define EFER_LMA (1<<_EFER_LMA) +#define EFER_NX (1<<_EFER_NX) +#define EFER_SVME (1<<_EFER_SVME) +#define EFER_LMSLE (1<<_EFER_LMSLE) +#define EFER_FFXSR (1<<_EFER_FFXSR) + +/* Intel MSRs. Some also available on other CPUs */ + +#define MSR_PPIN_CTL 0x0000004e +#define MSR_PPIN 0x0000004f + +#define MSR_IA32_PERFCTR0 0x000000c1 +#define MSR_IA32_PERFCTR1 0x000000c2 +#define MSR_FSB_FREQ 0x000000cd +#define MSR_PLATFORM_INFO 0x000000ce + +#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 +#define NHM_C3_AUTO_DEMOTE (1UL << 25) +#define NHM_C1_AUTO_DEMOTE (1UL << 26) +#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) +#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) +#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) + +#define MSR_MTRRcap 0x000000fe +#define MSR_IA32_BBL_CR_CTL 0x00000119 +#define MSR_IA32_BBL_CR_CTL3 0x0000011e + +#define MSR_IA32_SYSENTER_CS 0x00000174 +#define MSR_IA32_SYSENTER_ESP 0x00000175 +#define MSR_IA32_SYSENTER_EIP 0x00000176 + +#define MSR_IA32_MCG_CAP 0x00000179 +#define MSR_IA32_MCG_STATUS 0x0000017a +#define MSR_IA32_MCG_CTL 0x0000017b +#define MSR_IA32_MCG_EXT_CTL 0x000004d0 + +#define MSR_OFFCORE_RSP_0 0x000001a6 +#define MSR_OFFCORE_RSP_1 0x000001a7 +#define MSR_TURBO_RATIO_LIMIT 0x000001ad +#define MSR_TURBO_RATIO_LIMIT1 0x000001ae +#define MSR_TURBO_RATIO_LIMIT2 0x000001af + +#define MSR_LBR_SELECT 0x000001c8 +#define MSR_LBR_TOS 0x000001c9 +#define MSR_LBR_NHM_FROM 0x00000680 +#define MSR_LBR_NHM_TO 0x000006c0 +#define MSR_LBR_CORE_FROM 0x00000040 +#define MSR_LBR_CORE_TO 0x00000060 + +#define MSR_LBR_INFO_0 0x00000dc0 /* ... 0xddf for _31 */ +#define LBR_INFO_MISPRED BIT_ULL(63) +#define LBR_INFO_IN_TX BIT_ULL(62) +#define LBR_INFO_ABORT BIT_ULL(61) +#define LBR_INFO_CYCLES 0xffff + +#define MSR_IA32_PEBS_ENABLE 0x000003f1 +#define MSR_IA32_DS_AREA 0x00000600 +#define MSR_IA32_PERF_CAPABILITIES 0x00000345 +#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6 + +#define MSR_IA32_RTIT_CTL 0x00000570 +#define MSR_IA32_RTIT_STATUS 0x00000571 +#define MSR_IA32_RTIT_ADDR0_A 0x00000580 +#define MSR_IA32_RTIT_ADDR0_B 0x00000581 +#define MSR_IA32_RTIT_ADDR1_A 0x00000582 +#define MSR_IA32_RTIT_ADDR1_B 0x00000583 +#define MSR_IA32_RTIT_ADDR2_A 0x00000584 +#define MSR_IA32_RTIT_ADDR2_B 0x00000585 +#define MSR_IA32_RTIT_ADDR3_A 0x00000586 +#define MSR_IA32_RTIT_ADDR3_B 0x00000587 +#define MSR_IA32_RTIT_CR3_MATCH 0x00000572 +#define MSR_IA32_RTIT_OUTPUT_BASE 0x00000560 +#define MSR_IA32_RTIT_OUTPUT_MASK 0x00000561 + +#define MSR_MTRRfix64K_00000 0x00000250 +#define MSR_MTRRfix16K_80000 0x00000258 +#define MSR_MTRRfix16K_A0000 0x00000259 +#define MSR_MTRRfix4K_C0000 0x00000268 +#define MSR_MTRRfix4K_C8000 0x00000269 +#define MSR_MTRRfix4K_D0000 0x0000026a +#define MSR_MTRRfix4K_D8000 0x0000026b +#define MSR_MTRRfix4K_E0000 0x0000026c +#define MSR_MTRRfix4K_E8000 0x0000026d +#define MSR_MTRRfix4K_F0000 0x0000026e +#define MSR_MTRRfix4K_F8000 0x0000026f +#define MSR_MTRRdefType 0x000002ff + +#define MSR_IA32_CR_PAT 0x00000277 + +#define MSR_IA32_DEBUGCTLMSR 0x000001d9 +#define MSR_IA32_LASTBRANCHFROMIP 0x000001db +#define MSR_IA32_LASTBRANCHTOIP 0x000001dc +#define MSR_IA32_LASTINTFROMIP 0x000001dd +#define MSR_IA32_LASTINTTOIP 0x000001de + +/* DEBUGCTLMSR bits (others vary by model): */ +#define DEBUGCTLMSR_LBR (1UL << 0) /* last branch recording */ +#define DEBUGCTLMSR_BTF (1UL << 1) /* single-step on branches */ +#define DEBUGCTLMSR_TR (1UL << 6) +#define DEBUGCTLMSR_BTS (1UL << 7) +#define DEBUGCTLMSR_BTINT (1UL << 8) +#define DEBUGCTLMSR_BTS_OFF_OS (1UL << 9) +#define DEBUGCTLMSR_BTS_OFF_USR (1UL << 10) +#define DEBUGCTLMSR_FREEZE_LBRS_ON_PMI (1UL << 11) + +#define MSR_PEBS_FRONTEND 0x000003f7 + +#define MSR_IA32_POWER_CTL 0x000001fc + +#define MSR_IA32_MC0_CTL 0x00000400 +#define MSR_IA32_MC0_STATUS 0x00000401 +#define MSR_IA32_MC0_ADDR 0x00000402 +#define MSR_IA32_MC0_MISC 0x00000403 + +/* C-state Residency Counters */ +#define MSR_PKG_C3_RESIDENCY 0x000003f8 +#define MSR_PKG_C6_RESIDENCY 0x000003f9 +#define MSR_PKG_C7_RESIDENCY 0x000003fa +#define MSR_CORE_C3_RESIDENCY 0x000003fc +#define MSR_CORE_C6_RESIDENCY 0x000003fd +#define MSR_CORE_C7_RESIDENCY 0x000003fe +#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff +#define MSR_PKG_C2_RESIDENCY 0x0000060d +#define MSR_PKG_C8_RESIDENCY 0x00000630 +#define MSR_PKG_C9_RESIDENCY 0x00000631 +#define MSR_PKG_C10_RESIDENCY 0x00000632 + +/* Interrupt Response Limit */ +#define MSR_PKGC3_IRTL 0x0000060a +#define MSR_PKGC6_IRTL 0x0000060b +#define MSR_PKGC7_IRTL 0x0000060c +#define MSR_PKGC8_IRTL 0x00000633 +#define MSR_PKGC9_IRTL 0x00000634 +#define MSR_PKGC10_IRTL 0x00000635 + +/* Run Time Average Power Limiting (RAPL) Interface */ + +#define MSR_RAPL_POWER_UNIT 0x00000606 + +#define MSR_PKG_POWER_LIMIT 0x00000610 +#define MSR_PKG_ENERGY_STATUS 0x00000611 +#define MSR_PKG_PERF_STATUS 0x00000613 +#define MSR_PKG_POWER_INFO 0x00000614 + +#define MSR_DRAM_POWER_LIMIT 0x00000618 +#define MSR_DRAM_ENERGY_STATUS 0x00000619 +#define MSR_DRAM_PERF_STATUS 0x0000061b +#define MSR_DRAM_POWER_INFO 0x0000061c + +#define MSR_PP0_POWER_LIMIT 0x00000638 +#define MSR_PP0_ENERGY_STATUS 0x00000639 +#define MSR_PP0_POLICY 0x0000063a +#define MSR_PP0_PERF_STATUS 0x0000063b + +#define MSR_PP1_POWER_LIMIT 0x00000640 +#define MSR_PP1_ENERGY_STATUS 0x00000641 +#define MSR_PP1_POLICY 0x00000642 + +/* Config TDP MSRs */ +#define MSR_CONFIG_TDP_NOMINAL 0x00000648 +#define MSR_CONFIG_TDP_LEVEL_1 0x00000649 +#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A +#define MSR_CONFIG_TDP_CONTROL 0x0000064B +#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C + +#define MSR_PLATFORM_ENERGY_STATUS 0x0000064D + +#define MSR_PKG_WEIGHTED_CORE_C0_RES 0x00000658 +#define MSR_PKG_ANY_CORE_C0_RES 0x00000659 +#define MSR_PKG_ANY_GFXE_C0_RES 0x0000065A +#define MSR_PKG_BOTH_CORE_GFXE_C0_RES 0x0000065B + +#define MSR_CORE_C1_RES 0x00000660 + +#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 +#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 + +#define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 +#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 +#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 + +/* Hardware P state interface */ +#define MSR_PPERF 0x0000064e +#define MSR_PERF_LIMIT_REASONS 0x0000064f +#define MSR_PM_ENABLE 0x00000770 +#define MSR_HWP_CAPABILITIES 0x00000771 +#define MSR_HWP_REQUEST_PKG 0x00000772 +#define MSR_HWP_INTERRUPT 0x00000773 +#define MSR_HWP_REQUEST 0x00000774 +#define MSR_HWP_STATUS 0x00000777 + +/* CPUID.6.EAX */ +#define HWP_BASE_BIT (1<<7) +#define HWP_NOTIFICATIONS_BIT (1<<8) +#define HWP_ACTIVITY_WINDOW_BIT (1<<9) +#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10) +#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11) + +/* IA32_HWP_CAPABILITIES */ +#define HWP_HIGHEST_PERF(x) (((x) >> 0) & 0xff) +#define HWP_GUARANTEED_PERF(x) (((x) >> 8) & 0xff) +#define HWP_MOSTEFFICIENT_PERF(x) (((x) >> 16) & 0xff) +#define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff) + +/* IA32_HWP_REQUEST */ +#define HWP_MIN_PERF(x) (x & 0xff) +#define HWP_MAX_PERF(x) ((x & 0xff) << 8) +#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16) +#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24) +#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32) +#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42) + +/* IA32_HWP_STATUS */ +#define HWP_GUARANTEED_CHANGE(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4) + +/* IA32_HWP_INTERRUPT */ +#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1) +#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2) + +#define MSR_AMD64_MC0_MASK 0xc0010044 + +#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) +#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) +#define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) +#define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) + +#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) + +/* These are consecutive and not in the normal 4er MCE bank block */ +#define MSR_IA32_MC0_CTL2 0x00000280 +#define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) + +#define MSR_P6_PERFCTR0 0x000000c1 +#define MSR_P6_PERFCTR1 0x000000c2 +#define MSR_P6_EVNTSEL0 0x00000186 +#define MSR_P6_EVNTSEL1 0x00000187 + +#define MSR_KNC_PERFCTR0 0x00000020 +#define MSR_KNC_PERFCTR1 0x00000021 +#define MSR_KNC_EVNTSEL0 0x00000028 +#define MSR_KNC_EVNTSEL1 0x00000029 + +/* Alternative perfctr range with full access. */ +#define MSR_IA32_PMC0 0x000004c1 + +/* AMD64 MSRs. Not complete. See the architecture manual for a more + complete list. */ + +#define MSR_AMD64_PATCH_LEVEL 0x0000008b +#define MSR_AMD64_TSC_RATIO 0xc0000104 +#define MSR_AMD64_NB_CFG 0xc001001f +#define MSR_AMD64_PATCH_LOADER 0xc0010020 +#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 +#define MSR_AMD64_OSVW_STATUS 0xc0010141 +#define MSR_AMD64_LS_CFG 0xc0011020 +#define MSR_AMD64_DC_CFG 0xc0011022 +#define MSR_AMD64_BU_CFG2 0xc001102a +#define MSR_AMD64_IBSFETCHCTL 0xc0011030 +#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 +#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 +#define MSR_AMD64_IBSFETCH_REG_COUNT 3 +#define MSR_AMD64_IBSFETCH_REG_MASK ((1UL<<MSR_AMD64_IBSFETCH_REG_COUNT)-1) +#define MSR_AMD64_IBSOPCTL 0xc0011033 +#define MSR_AMD64_IBSOPRIP 0xc0011034 +#define MSR_AMD64_IBSOPDATA 0xc0011035 +#define MSR_AMD64_IBSOPDATA2 0xc0011036 +#define MSR_AMD64_IBSOPDATA3 0xc0011037 +#define MSR_AMD64_IBSDCLINAD 0xc0011038 +#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 +#define MSR_AMD64_IBSOP_REG_COUNT 7 +#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1) +#define MSR_AMD64_IBSCTL 0xc001103a +#define MSR_AMD64_IBSBRTARGET 0xc001103b +#define MSR_AMD64_IBSOPDATA4 0xc001103d +#define MSR_AMD64_IBS_REG_COUNT_MAX 8 /* includes MSR_AMD64_IBSBRTARGET */ + +/* Fam 17h MSRs */ +#define MSR_F17H_IRPERF 0xc00000e9 + +/* Fam 16h MSRs */ +#define MSR_F16H_L2I_PERF_CTL 0xc0010230 +#define MSR_F16H_L2I_PERF_CTR 0xc0010231 +#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 +#define MSR_F16H_DR2_ADDR_MASK 0xc001101a +#define MSR_F16H_DR3_ADDR_MASK 0xc001101b +#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 + +/* Fam 15h MSRs */ +#define MSR_F15H_PERF_CTL 0xc0010200 +#define MSR_F15H_PERF_CTR 0xc0010201 +#define MSR_F15H_NB_PERF_CTL 0xc0010240 +#define MSR_F15H_NB_PERF_CTR 0xc0010241 +#define MSR_F15H_PTSC 0xc0010280 +#define MSR_F15H_IC_CFG 0xc0011021 + +/* Fam 10h MSRs */ +#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 +#define FAM10H_MMIO_CONF_ENABLE (1<<0) +#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf +#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2 +#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL +#define FAM10H_MMIO_CONF_BASE_SHIFT 20 +#define MSR_FAM10H_NODE_ID 0xc001100c + +/* K8 MSRs */ +#define MSR_K8_TOP_MEM1 0xc001001a +#define MSR_K8_TOP_MEM2 0xc001001d +#define MSR_K8_SYSCFG 0xc0010010 +#define MSR_K8_INT_PENDING_MSG 0xc0010055 +/* C1E active bits in int pending message */ +#define K8_INTP_C1E_ACTIVE_MASK 0x18000000 +#define MSR_K8_TSEG_ADDR 0xc0010112 +#define MSR_K8_TSEG_MASK 0xc0010113 +#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ +#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ +#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 /* Mask: RdMem|WrMem */ + +/* K7 MSRs */ +#define MSR_K7_EVNTSEL0 0xc0010000 +#define MSR_K7_PERFCTR0 0xc0010004 +#define MSR_K7_EVNTSEL1 0xc0010001 +#define MSR_K7_PERFCTR1 0xc0010005 +#define MSR_K7_EVNTSEL2 0xc0010002 +#define MSR_K7_PERFCTR2 0xc0010006 +#define MSR_K7_EVNTSEL3 0xc0010003 +#define MSR_K7_PERFCTR3 0xc0010007 +#define MSR_K7_CLK_CTL 0xc001001b +#define MSR_K7_HWCR 0xc0010015 +#define MSR_K7_FID_VID_CTL 0xc0010041 +#define MSR_K7_FID_VID_STATUS 0xc0010042 + +/* K6 MSRs */ +#define MSR_K6_WHCR 0xc0000082 +#define MSR_K6_UWCCR 0xc0000085 +#define MSR_K6_EPMR 0xc0000086 +#define MSR_K6_PSOR 0xc0000087 +#define MSR_K6_PFIR 0xc0000088 + +/* Centaur-Hauls/IDT defined MSRs. */ +#define MSR_IDT_FCR1 0x00000107 +#define MSR_IDT_FCR2 0x00000108 +#define MSR_IDT_FCR3 0x00000109 +#define MSR_IDT_FCR4 0x0000010a + +#define MSR_IDT_MCR0 0x00000110 +#define MSR_IDT_MCR1 0x00000111 +#define MSR_IDT_MCR2 0x00000112 +#define MSR_IDT_MCR3 0x00000113 +#define MSR_IDT_MCR4 0x00000114 +#define MSR_IDT_MCR5 0x00000115 +#define MSR_IDT_MCR6 0x00000116 +#define MSR_IDT_MCR7 0x00000117 +#define MSR_IDT_MCR_CTRL 0x00000120 + +/* VIA Cyrix defined MSRs*/ +#define MSR_VIA_FCR 0x00001107 +#define MSR_VIA_LONGHAUL 0x0000110a +#define MSR_VIA_RNG 0x0000110b +#define MSR_VIA_BCR2 0x00001147 + +/* Transmeta defined MSRs */ +#define MSR_TMTA_LONGRUN_CTRL 0x80868010 +#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 +#define MSR_TMTA_LRTI_READOUT 0x80868018 +#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a + +/* Intel defined MSRs. */ +#define MSR_IA32_P5_MC_ADDR 0x00000000 +#define MSR_IA32_P5_MC_TYPE 0x00000001 +#define MSR_IA32_TSC 0x00000010 +#define MSR_IA32_PLATFORM_ID 0x00000017 +#define MSR_IA32_EBL_CR_POWERON 0x0000002a +#define MSR_EBC_FREQUENCY_ID 0x0000002c +#define MSR_SMI_COUNT 0x00000034 +#define MSR_IA32_FEATURE_CONTROL 0x0000003a +#define MSR_IA32_TSC_ADJUST 0x0000003b +#define MSR_IA32_BNDCFGS 0x00000d90 + +#define MSR_IA32_XSS 0x00000da0 + +#define FEATURE_CONTROL_LOCKED (1<<0) +#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1) +#define FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX (1<<2) +#define FEATURE_CONTROL_LMCE (1<<20) + +#define MSR_IA32_APICBASE 0x0000001b +#define MSR_IA32_APICBASE_BSP (1<<8) +#define MSR_IA32_APICBASE_ENABLE (1<<11) +#define MSR_IA32_APICBASE_BASE (0xfffff<<12) + +#define MSR_IA32_TSCDEADLINE 0x000006e0 + +#define MSR_IA32_UCODE_WRITE 0x00000079 +#define MSR_IA32_UCODE_REV 0x0000008b + +#define MSR_IA32_SMM_MONITOR_CTL 0x0000009b +#define MSR_IA32_SMBASE 0x0000009e + +#define MSR_IA32_PERF_STATUS 0x00000198 +#define MSR_IA32_PERF_CTL 0x00000199 +#define INTEL_PERF_CTL_MASK 0xffff +#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 +#define MSR_AMD_PERF_STATUS 0xc0010063 +#define MSR_AMD_PERF_CTL 0xc0010062 + +#define MSR_IA32_MPERF 0x000000e7 +#define MSR_IA32_APERF 0x000000e8 + +#define MSR_IA32_THERM_CONTROL 0x0000019a +#define MSR_IA32_THERM_INTERRUPT 0x0000019b + +#define THERM_INT_HIGH_ENABLE (1 << 0) +#define THERM_INT_LOW_ENABLE (1 << 1) +#define THERM_INT_PLN_ENABLE (1 << 24) + +#define MSR_IA32_THERM_STATUS 0x0000019c + +#define THERM_STATUS_PROCHOT (1 << 0) +#define THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_THERM2_CTL 0x0000019d + +#define MSR_THERM2_CTL_TM_SELECT (1ULL << 16) + +#define MSR_IA32_MISC_ENABLE 0x000001a0 + +#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 + +#define MSR_MISC_PWR_MGMT 0x000001aa + +#define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 +#define ENERGY_PERF_BIAS_PERFORMANCE 0 +#define ENERGY_PERF_BIAS_NORMAL 6 +#define ENERGY_PERF_BIAS_POWERSAVE 15 + +#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 + +#define PACKAGE_THERM_STATUS_PROCHOT (1 << 0) +#define PACKAGE_THERM_STATUS_POWER_LIMIT (1 << 10) + +#define MSR_IA32_PACKAGE_THERM_INTERRUPT 0x000001b2 + +#define PACKAGE_THERM_INT_HIGH_ENABLE (1 << 0) +#define PACKAGE_THERM_INT_LOW_ENABLE (1 << 1) +#define PACKAGE_THERM_INT_PLN_ENABLE (1 << 24) + +/* Thermal Thresholds Support */ +#define THERM_INT_THRESHOLD0_ENABLE (1 << 15) +#define THERM_SHIFT_THRESHOLD0 8 +#define THERM_MASK_THRESHOLD0 (0x7f << THERM_SHIFT_THRESHOLD0) +#define THERM_INT_THRESHOLD1_ENABLE (1 << 23) +#define THERM_SHIFT_THRESHOLD1 16 +#define THERM_MASK_THRESHOLD1 (0x7f << THERM_SHIFT_THRESHOLD1) +#define THERM_STATUS_THRESHOLD0 (1 << 6) +#define THERM_LOG_THRESHOLD0 (1 << 7) +#define THERM_STATUS_THRESHOLD1 (1 << 8) +#define THERM_LOG_THRESHOLD1 (1 << 9) + +/* MISC_ENABLE bits: architectural */ +#define MSR_IA32_MISC_ENABLE_FAST_STRING_BIT 0 +#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) +#define MSR_IA32_MISC_ENABLE_TCC_BIT 1 +#define MSR_IA32_MISC_ENABLE_TCC (1ULL << MSR_IA32_MISC_ENABLE_TCC_BIT) +#define MSR_IA32_MISC_ENABLE_EMON_BIT 7 +#define MSR_IA32_MISC_ENABLE_EMON (1ULL << MSR_IA32_MISC_ENABLE_EMON_BIT) +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT 11 +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_BTS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT 12 +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL_BIT) +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT 16 +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP_BIT) +#define MSR_IA32_MISC_ENABLE_MWAIT_BIT 18 +#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << MSR_IA32_MISC_ENABLE_MWAIT_BIT) +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT 22 +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << MSR_IA32_MISC_ENABLE_LIMIT_CPUID_BIT) +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT 23 +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XTPR_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT 34 +#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_XD_DISABLE_BIT) + +/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ +#define MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT 2 +#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << MSR_IA32_MISC_ENABLE_X87_COMPAT_BIT) +#define MSR_IA32_MISC_ENABLE_TM1_BIT 3 +#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << MSR_IA32_MISC_ENABLE_TM1_BIT) +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT 4 +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT 6 +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT 8 +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT 9 +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR (1ULL << MSR_IA32_MISC_ENABLE_FERR_BIT) +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT 10 +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX_BIT) +#define MSR_IA32_MISC_ENABLE_TM2_BIT 13 +#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << MSR_IA32_MISC_ENABLE_TM2_BIT) +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT 19 +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT 20 +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK_BIT) +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT 24 +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << MSR_IA32_MISC_ENABLE_L1D_CONTEXT_BIT) +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT 37 +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT 38 +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_TURBO_DISABLE_BIT) +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT 39 +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE_BIT) + +#define MSR_IA32_TSC_DEADLINE 0x000006E0 + +/* P4/Xeon+ specific */ +#define MSR_IA32_MCG_EAX 0x00000180 +#define MSR_IA32_MCG_EBX 0x00000181 +#define MSR_IA32_MCG_ECX 0x00000182 +#define MSR_IA32_MCG_EDX 0x00000183 +#define MSR_IA32_MCG_ESI 0x00000184 +#define MSR_IA32_MCG_EDI 0x00000185 +#define MSR_IA32_MCG_EBP 0x00000186 +#define MSR_IA32_MCG_ESP 0x00000187 +#define MSR_IA32_MCG_EFLAGS 0x00000188 +#define MSR_IA32_MCG_EIP 0x00000189 +#define MSR_IA32_MCG_RESERVED 0x0000018a + +/* Pentium IV performance counter MSRs */ +#define MSR_P4_BPU_PERFCTR0 0x00000300 +#define MSR_P4_BPU_PERFCTR1 0x00000301 +#define MSR_P4_BPU_PERFCTR2 0x00000302 +#define MSR_P4_BPU_PERFCTR3 0x00000303 +#define MSR_P4_MS_PERFCTR0 0x00000304 +#define MSR_P4_MS_PERFCTR1 0x00000305 +#define MSR_P4_MS_PERFCTR2 0x00000306 +#define MSR_P4_MS_PERFCTR3 0x00000307 +#define MSR_P4_FLAME_PERFCTR0 0x00000308 +#define MSR_P4_FLAME_PERFCTR1 0x00000309 +#define MSR_P4_FLAME_PERFCTR2 0x0000030a +#define MSR_P4_FLAME_PERFCTR3 0x0000030b +#define MSR_P4_IQ_PERFCTR0 0x0000030c +#define MSR_P4_IQ_PERFCTR1 0x0000030d +#define MSR_P4_IQ_PERFCTR2 0x0000030e +#define MSR_P4_IQ_PERFCTR3 0x0000030f +#define MSR_P4_IQ_PERFCTR4 0x00000310 +#define MSR_P4_IQ_PERFCTR5 0x00000311 +#define MSR_P4_BPU_CCCR0 0x00000360 +#define MSR_P4_BPU_CCCR1 0x00000361 +#define MSR_P4_BPU_CCCR2 0x00000362 +#define MSR_P4_BPU_CCCR3 0x00000363 +#define MSR_P4_MS_CCCR0 0x00000364 +#define MSR_P4_MS_CCCR1 0x00000365 +#define MSR_P4_MS_CCCR2 0x00000366 +#define MSR_P4_MS_CCCR3 0x00000367 +#define MSR_P4_FLAME_CCCR0 0x00000368 +#define MSR_P4_FLAME_CCCR1 0x00000369 +#define MSR_P4_FLAME_CCCR2 0x0000036a +#define MSR_P4_FLAME_CCCR3 0x0000036b +#define MSR_P4_IQ_CCCR0 0x0000036c +#define MSR_P4_IQ_CCCR1 0x0000036d +#define MSR_P4_IQ_CCCR2 0x0000036e +#define MSR_P4_IQ_CCCR3 0x0000036f +#define MSR_P4_IQ_CCCR4 0x00000370 +#define MSR_P4_IQ_CCCR5 0x00000371 +#define MSR_P4_ALF_ESCR0 0x000003ca +#define MSR_P4_ALF_ESCR1 0x000003cb +#define MSR_P4_BPU_ESCR0 0x000003b2 +#define MSR_P4_BPU_ESCR1 0x000003b3 +#define MSR_P4_BSU_ESCR0 0x000003a0 +#define MSR_P4_BSU_ESCR1 0x000003a1 +#define MSR_P4_CRU_ESCR0 0x000003b8 +#define MSR_P4_CRU_ESCR1 0x000003b9 +#define MSR_P4_CRU_ESCR2 0x000003cc +#define MSR_P4_CRU_ESCR3 0x000003cd +#define MSR_P4_CRU_ESCR4 0x000003e0 +#define MSR_P4_CRU_ESCR5 0x000003e1 +#define MSR_P4_DAC_ESCR0 0x000003a8 +#define MSR_P4_DAC_ESCR1 0x000003a9 +#define MSR_P4_FIRM_ESCR0 0x000003a4 +#define MSR_P4_FIRM_ESCR1 0x000003a5 +#define MSR_P4_FLAME_ESCR0 0x000003a6 +#define MSR_P4_FLAME_ESCR1 0x000003a7 +#define MSR_P4_FSB_ESCR0 0x000003a2 +#define MSR_P4_FSB_ESCR1 0x000003a3 +#define MSR_P4_IQ_ESCR0 0x000003ba +#define MSR_P4_IQ_ESCR1 0x000003bb +#define MSR_P4_IS_ESCR0 0x000003b4 +#define MSR_P4_IS_ESCR1 0x000003b5 +#define MSR_P4_ITLB_ESCR0 0x000003b6 +#define MSR_P4_ITLB_ESCR1 0x000003b7 +#define MSR_P4_IX_ESCR0 0x000003c8 +#define MSR_P4_IX_ESCR1 0x000003c9 +#define MSR_P4_MOB_ESCR0 0x000003aa +#define MSR_P4_MOB_ESCR1 0x000003ab +#define MSR_P4_MS_ESCR0 0x000003c0 +#define MSR_P4_MS_ESCR1 0x000003c1 +#define MSR_P4_PMH_ESCR0 0x000003ac +#define MSR_P4_PMH_ESCR1 0x000003ad +#define MSR_P4_RAT_ESCR0 0x000003bc +#define MSR_P4_RAT_ESCR1 0x000003bd +#define MSR_P4_SAAT_ESCR0 0x000003ae +#define MSR_P4_SAAT_ESCR1 0x000003af +#define MSR_P4_SSU_ESCR0 0x000003be +#define MSR_P4_SSU_ESCR1 0x000003bf /* guess: not in manual */ + +#define MSR_P4_TBPU_ESCR0 0x000003c2 +#define MSR_P4_TBPU_ESCR1 0x000003c3 +#define MSR_P4_TC_ESCR0 0x000003c4 +#define MSR_P4_TC_ESCR1 0x000003c5 +#define MSR_P4_U2L_ESCR0 0x000003b0 +#define MSR_P4_U2L_ESCR1 0x000003b1 + +#define MSR_P4_PEBS_MATRIX_VERT 0x000003f2 + +/* Intel Core-based CPU performance counters */ +#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 +#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a +#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b +#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d +#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e +#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f +#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 + +/* Geode defined MSRs */ +#define MSR_GEODE_BUSCONT_CONF0 0x00001900 + +/* Intel VT MSRs */ +#define MSR_IA32_VMX_BASIC 0x00000480 +#define MSR_IA32_VMX_PINBASED_CTLS 0x00000481 +#define MSR_IA32_VMX_PROCBASED_CTLS 0x00000482 +#define MSR_IA32_VMX_EXIT_CTLS 0x00000483 +#define MSR_IA32_VMX_ENTRY_CTLS 0x00000484 +#define MSR_IA32_VMX_MISC 0x00000485 +#define MSR_IA32_VMX_CR0_FIXED0 0x00000486 +#define MSR_IA32_VMX_CR0_FIXED1 0x00000487 +#define MSR_IA32_VMX_CR4_FIXED0 0x00000488 +#define MSR_IA32_VMX_CR4_FIXED1 0x00000489 +#define MSR_IA32_VMX_VMCS_ENUM 0x0000048a +#define MSR_IA32_VMX_PROCBASED_CTLS2 0x0000048b +#define MSR_IA32_VMX_EPT_VPID_CAP 0x0000048c +#define MSR_IA32_VMX_TRUE_PINBASED_CTLS 0x0000048d +#define MSR_IA32_VMX_TRUE_PROCBASED_CTLS 0x0000048e +#define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x0000048f +#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490 +#define MSR_IA32_VMX_VMFUNC 0x00000491 + +/* VMX_BASIC bits and bitmasks */ +#define VMX_BASIC_VMCS_SIZE_SHIFT 32 +#define VMX_BASIC_TRUE_CTLS (1ULL << 55) +#define VMX_BASIC_64 0x0001000000000000LLU +#define VMX_BASIC_MEM_TYPE_SHIFT 50 +#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU +#define VMX_BASIC_MEM_TYPE_WB 6LLU +#define VMX_BASIC_INOUT 0x0040000000000000LLU + +/* MSR_IA32_VMX_MISC bits */ +#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29) +#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F +/* AMD-V MSRs */ + +#define MSR_VM_CR 0xc0010114 +#define MSR_VM_IGNNE 0xc0010115 +#define MSR_VM_HSAVE_PA 0xc0010117 + +#endif /* _UAPI_ASM_X86_MSR_INDEX_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi 2017-01-23 14:58 ` [PATCH v4 3/7] x86: put msr-index.h " Nicolas Dichtel @ 2017-01-23 16:52 ` Borislav Petkov 2017-01-23 17:06 ` Nicolas Dichtel 2017-01-30 14:51 ` Russell King - ARM Linux 2017-01-23 17:49 ` kbuild test robot ` (2 subsequent siblings) 3 siblings, 2 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-23 16:52 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe On Mon, Jan 23, 2017 at 03:58:37PM +0100, Nicolas Dichtel wrote: > This header file is exported, thus move it to uapi. Why? Why is this damn thing exported in the first place? The moment we decide to change an MSR name or even remove it from that file, we break userspace. And what for, because userspace is using some arbitrary header file which was meant to be for the kernel solely. NAKed-by: Borislav Petkov <bp@suse.de> -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi 2017-01-23 16:52 ` Borislav Petkov @ 2017-01-23 17:06 ` Nicolas Dichtel 2017-01-23 17:17 ` Borislav Petkov 2017-01-30 14:51 ` Russell King - ARM Linux 1 sibling, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-23 17:06 UTC (permalink / raw) To: Borislav Petkov Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, hpa + Peter Anvin and Ingo Molnar Le 23/01/2017 à 17:52, Borislav Petkov a écrit : > On Mon, Jan 23, 2017 at 03:58:37PM +0100, Nicolas Dichtel wrote: >> This header file is exported, thus move it to uapi. > > Why? Why is this damn thing exported in the first place? It is exported because it is listed in arch/x86/include/uapi/asm/Kbuild: header-y += msr-index.h (see also patch #4). > > The moment we decide to change an MSR name or even remove it from that > file, we break userspace. And what for, because userspace is using some > arbitrary header file which was meant to be for the kernel solely. I understand your concerns but my patch does not change anything. And I think David's comment is right: if I remove it, I break the uapi. After digging a bit, it seems you have already tried to remove it in commit b72e7464e4cf ("x86/uapi: Do not export <asm/msr-index.h> as part of the user API headers"), but because this file is still listed in the Kbuild file, it is still exported. It would be great if we could find a consensus about what to do with this file because it blocks patch #4 and the rest of the series. Thank you, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi 2017-01-23 17:06 ` Nicolas Dichtel @ 2017-01-23 17:17 ` Borislav Petkov 2017-01-23 17:21 ` Christoph Hellwig 0 siblings, 1 reply; 554+ messages in thread From: Borislav Petkov @ 2017-01-23 17:17 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, hpa On Mon, Jan 23, 2017 at 06:06:52PM +0100, Nicolas Dichtel wrote: > After digging a bit, it seems you have already tried to remove it in commit > b72e7464e4cf ("x86/uapi: Do not export <asm/msr-index.h> as part of the user API > headers"), but because this file is still listed in the Kbuild file, it is still > exported. Oh great. :-\ > It would be great if we could find a consensus about what to do with > this file because it blocks patch #4 and the rest of the series. The reasoning in b72e7464e4cf was valid then and is valid now. This thing should not have been exported in the first place. And it's not like I didn't try then. Dammit! I know, we should not ever break userspace but if it were me, I'd remove that export and see what breaks. If at all. But let's see what the others think first. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi 2017-01-23 17:17 ` Borislav Petkov @ 2017-01-23 17:21 ` Christoph Hellwig 2017-01-23 17:26 ` Borislav Petkov 0 siblings, 1 reply; 554+ messages in thread From: Christoph Hellwig @ 2017-01-23 17:21 UTC (permalink / raw) To: Borislav Petkov Cc: Nicolas Dichtel, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, hpa On Mon, Jan 23, 2017 at 06:17:32PM +0100, Borislav Petkov wrote: > I know, we should not ever break userspace but if it were me, I'd remove > that export and see what breaks. If at all. Or keep the exported version as-is and never changed it, and use a different copy for the kernel itself. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi 2017-01-23 17:21 ` Christoph Hellwig @ 2017-01-23 17:26 ` Borislav Petkov 2017-01-23 22:24 ` Jan Engelhardt 2017-01-26 16:02 ` Nicolas Dichtel 0 siblings, 2 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-23 17:26 UTC (permalink / raw) To: Christoph Hellwig Cc: Nicolas Dichtel, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, tklauser, mpe, mingo, hpa On Mon, Jan 23, 2017 at 09:21:03AM -0800, Christoph Hellwig wrote: > Or keep the exported version as-is and never changed it, and use > a different copy for the kernel itself. Yeah, that's a good idea, thanks Christoph. I guess we'll have to do that if something in userspace has put its sticky fingers on that file and cannot be fixed. Which I hardly doubt but we can't break that damn userspace. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi 2017-01-23 17:26 ` Borislav Petkov @ 2017-01-23 22:24 ` Jan Engelhardt 2017-01-23 22:51 ` Borislav Petkov 2017-01-26 16:02 ` Nicolas Dichtel 1 sibling, 1 reply; 554+ messages in thread From: Jan Engelhardt @ 2017-01-23 22:24 UTC (permalink / raw) To: Borislav Petkov Cc: Christoph Hellwig, Nicolas Dichtel, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, slash.tmp, daniel.vetter, rmk+kernel, msalter, tklauser, mpe, mingo, hpa On Monday 2017-01-23 18:26, Borislav Petkov wrote: >On Mon, Jan 23, 2017 at 09:21:03AM -0800, Christoph Hellwig wrote: >> Or keep the exported version as-is and never changed it, and use >> a different copy for the kernel itself. > >I guess we'll have to do that if something in userspace has put its >sticky fingers on that file and cannot be fixed. Which I hardly doubt >but we can't break that damn userspace. The importance of uapi headers presence is a bit overrated. If you look at, for example, iptables (and further projects in that area), copies of uapi headers have been made (and this process is likely to continue) because it could be compiled on a variety of vintage systems that do not have all required #defines yet. Similarly, it may be built on a variety of _modern_ systems whose kernels no longer have a particular thing (e.g. ipt_SAME), so it also ships copies of those headers. So if some userspace component depends on that particular msr header (which, unlike ipt_SAME, was not intended for export), is it not reasonable to expect them to make a copy if and when they need it? ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi 2017-01-23 22:24 ` Jan Engelhardt @ 2017-01-23 22:51 ` Borislav Petkov 0 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-23 22:51 UTC (permalink / raw) To: Jan Engelhardt Cc: Christoph Hellwig, Nicolas Dichtel, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, slash.tmp, daniel.vetter, rmk+kernel, msalter, tklauser, mpe, mingo, hpa On Mon, Jan 23, 2017 at 11:24:02PM +0100, Jan Engelhardt wrote: > So if some userspace component depends on that particular msr header > (which, unlike ipt_SAME, was not intended for export), is it not > reasonable to expect them to make a copy if and when they need it? Yeah, either copy the whole header or better yet use own defines. Especially in this particular case, where we have a bunch of MSRs which are in the processor manuals. Exporting the defines is pretty pointless and even disadvantageous for the kernel. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi 2017-01-23 17:26 ` Borislav Petkov 2017-01-23 22:24 ` Jan Engelhardt @ 2017-01-26 16:02 ` Nicolas Dichtel 1 sibling, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-26 16:02 UTC (permalink / raw) To: Borislav Petkov, Christoph Hellwig Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, tklauser, mpe, mingo, hpa Le 23/01/2017 à 18:26, Borislav Petkov a écrit : > On Mon, Jan 23, 2017 at 09:21:03AM -0800, Christoph Hellwig wrote: >> Or keep the exported version as-is and never changed it, and use >> a different copy for the kernel itself. > > Yeah, that's a good idea, thanks Christoph. > > I guess we'll have to do that if something in userspace has put its > sticky fingers on that file and cannot be fixed. Which I hardly doubt > but we can't break that damn userspace. > So do you agree with the current patch (a build-fix is also needed :/)? ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi 2017-01-23 16:52 ` Borislav Petkov 2017-01-23 17:06 ` Nicolas Dichtel @ 2017-01-30 14:51 ` Russell King - ARM Linux 2017-01-30 15:30 ` Borislav Petkov ` (2 more replies) 1 sibling, 3 replies; 554+ messages in thread From: Russell King - ARM Linux @ 2017-01-30 14:51 UTC (permalink / raw) To: Borislav Petkov Cc: Nicolas Dichtel, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, slash.tmp, daniel.vetter, msalter, jengelh, hch, tklauser, mpe On Mon, Jan 23, 2017 at 05:52:45PM +0100, Borislav Petkov wrote: > On Mon, Jan 23, 2017 at 03:58:37PM +0100, Nicolas Dichtel wrote: > > This header file is exported, thus move it to uapi. > > Why? Why is this damn thing exported in the first place? > > The moment we decide to change an MSR name or even remove it from that > file, we break userspace. And what for, because userspace is using some > arbitrary header file which was meant to be for the kernel solely. > > NAKed-by: Borislav Petkov <bp@suse.de> Here on my Fedora system: $ less /usr/include/asm/msr-index.h #ifndef _ASM_X86_MSR_INDEX_H #define _ASM_X86_MSR_INDEX_H /* CPU model specific register (MSR) numbers */ /* x86-64 specific MSRs */ #define MSR_EFER 0xc0000080 /* extended feature register */ #define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ #define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ ... Like it or not, it is _already_ exported to userspace, so it forms part of the user ABI. You can try to remove it from userspace view, but if anyone has already started to use it, removing it will already cause a userspace regression. So, I don't think we have any grounds to NAK these patches on the basis of "we don't want this to be visible to userspace because it may cause a userspace regression." Removing it from userspace view is likely to cause a userspace regression. This patch just makes sure that such a regression doesn't happen when kbuild stops exporting files in _non_-uapi directories. -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi 2017-01-30 14:51 ` Russell King - ARM Linux @ 2017-01-30 15:30 ` Borislav Petkov 2017-01-31 10:58 ` Nicolas Dichtel 2017-01-31 16:21 ` Ingo Molnar 2 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-30 15:30 UTC (permalink / raw) To: Russell King - ARM Linux Cc: Nicolas Dichtel, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, slash.tmp, daniel.vetter, msalter, jengelh, hch, tklauser, mpe On Mon, Jan 30, 2017 at 02:51:51PM +0000, Russell King - ARM Linux wrote: > Like it or not, it is _already_ exported to userspace, so it forms Well, I did try to stop it then too: b72e7464e4cf ("x86/uapi: Do not export <asm/msr-index.h> as part of the user API headers") And yet this wankery trickled out to userspace anyway. > part of the user ABI. You can try to remove it from userspace view, > but if anyone has already started to use it, removing it will already > cause a userspace regression. Well, if it were me, I'd still remove the header and see if anything breaks. If it does - which I doubt very much - we can do Christoph's idea of leaving the current version of the header exported but then untangling it from the whole uapi crap and use our own kernel version which we can change as much as we can. In the end of the day, it is a maintainer decision what's going to happen. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi 2017-01-30 14:51 ` Russell King - ARM Linux 2017-01-30 15:30 ` Borislav Petkov @ 2017-01-31 10:58 ` Nicolas Dichtel 2017-01-31 16:21 ` Ingo Molnar 2 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-31 10:58 UTC (permalink / raw) To: Russell King - ARM Linux, Borislav Petkov Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, slash.tmp, daniel.vetter, msalter, jengelh, hch, tklauser, mpe, Ingo Molnar Le 30/01/2017 à 15:51, Russell King - ARM Linux a écrit : > On Mon, Jan 23, 2017 at 05:52:45PM +0100, Borislav Petkov wrote: >> On Mon, Jan 23, 2017 at 03:58:37PM +0100, Nicolas Dichtel wrote: >>> This header file is exported, thus move it to uapi. >> >> Why? Why is this damn thing exported in the first place? >> >> The moment we decide to change an MSR name or even remove it from that >> file, we break userspace. And what for, because userspace is using some >> arbitrary header file which was meant to be for the kernel solely. >> >> NAKed-by: Borislav Petkov <bp@suse.de> > > Here on my Fedora system: > > $ less /usr/include/asm/msr-index.h > #ifndef _ASM_X86_MSR_INDEX_H > #define _ASM_X86_MSR_INDEX_H > > /* CPU model specific register (MSR) numbers */ > > /* x86-64 specific MSRs */ > #define MSR_EFER 0xc0000080 /* extended feature register */ > #define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ > #define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ > ... > > Like it or not, it is _already_ exported to userspace, so it forms > part of the user ABI. You can try to remove it from userspace view, > but if anyone has already started to use it, removing it will already > cause a userspace regression. > > So, I don't think we have any grounds to NAK these patches on the > basis of "we don't want this to be visible to userspace because it > may cause a userspace regression." Removing it from userspace view > is likely to cause a userspace regression. > > This patch just makes sure that such a regression doesn't happen when > kbuild stops exporting files in _non_-uapi directories. Yes, it was the only goal. My patch changes nothing! Is it possible to find a consensus about this patch? Ingo ? ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi 2017-01-30 14:51 ` Russell King - ARM Linux 2017-01-30 15:30 ` Borislav Petkov 2017-01-31 10:58 ` Nicolas Dichtel @ 2017-01-31 16:21 ` Ingo Molnar 2017-02-02 13:25 ` [PATCH v5 0/8] uapi: export all headers under uapi directories Nicolas Dichtel 2 siblings, 1 reply; 554+ messages in thread From: Ingo Molnar @ 2017-01-31 16:21 UTC (permalink / raw) To: Russell King - ARM Linux Cc: Borislav Petkov, Nicolas Dichtel, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, slash.tmp, daniel.vetter, msalter, jengelh, hch, tklauser, mpe, Linus Torvalds, Thomas Gleixner, H. Peter Anvin, Peter Zijlstra * Russell King - ARM Linux <linux@armlinux.org.uk> wrote: > On Mon, Jan 23, 2017 at 05:52:45PM +0100, Borislav Petkov wrote: > > On Mon, Jan 23, 2017 at 03:58:37PM +0100, Nicolas Dichtel wrote: > > > This header file is exported, thus move it to uapi. > > > > Why? Why is this damn thing exported in the first place? > > > > The moment we decide to change an MSR name or even remove it from that > > file, we break userspace. And what for, because userspace is using some > > arbitrary header file which was meant to be for the kernel solely. > > > > NAKed-by: Borislav Petkov <bp@suse.de> > > Here on my Fedora system: > > $ less /usr/include/asm/msr-index.h > #ifndef _ASM_X86_MSR_INDEX_H > #define _ASM_X86_MSR_INDEX_H > > /* CPU model specific register (MSR) numbers */ > > /* x86-64 specific MSRs */ > #define MSR_EFER 0xc0000080 /* extended feature register */ > #define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target */ > #define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target */ > ... > > Like it or not, it is _already_ exported to userspace, so it forms > part of the user ABI. Firstly, I believe you are (very!) confused about what forms part of the Linux user-space ABI - it's not the exported headers but the functionality and how application _binaries_ rely on it. We have strong ABI guarantees that are in no header anywhere. And we have tons and tons of details in UAPI headers that are not part of any system call ABI (or protocol ABI) of Linux. Note that for example the 'MSR_STAR' definition you quote above is not part of the ABI, because user-space _cannot make use of it_: it's a privileged CPU register that only the kernel can write to. There's no system call ABI that Linux defines that this MSR (or any other MSR for that matter) are part of. These MSR headers are not part of the ABI - they are part of the _mechanism_ trying to inform user-space about ABIs and people trying to somehow claim that they are an ABI are confused IMHO. The point with msr-index.h is that there's no user-space ABI where those MSRs are enumerated. Secondly, ABI means 'Application Binary Interface' - note the 'Binary' part. The ABI cannot be broken, by definition, by putting a header into another place. Now we do export UAPI headers and we definitely don't want to break user-space tooling if we can avoid it, but trying to spin the UAPI headers mechanism into an "ABI" is confused on so many levels. I.e. this whole discussion is silly in the extreme. The point of the UAPI exports is to clean up our ABI exports, after we used to export _all_ headers to user-space. I.e. by definition the UAPI mechanism is fundamentally about _restricting_ the amount of headers that are exposed - separating true ABI from random kernel internals. This process of enumerating ABI details separately from kernel implementation internal details improves the kernel headers. > [...] You can try to remove it from userspace view, but if anyone has already > started to use it, removing it will already cause a userspace regression. I challenge you to show a single user-space regression from the removal of the 'MSR_STAR' definition for example. Please explain, why do you want to export msr-index.h and which part of it is an 'ABI' in your opinion? Until you can explain that my NAK stands. Thanks, Ingo ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v5 0/8] uapi: export all headers under uapi directories 2017-01-31 16:21 ` Ingo Molnar @ 2017-02-02 13:25 ` Nicolas Dichtel 2017-02-02 13:25 ` [PATCH v5 1/8] h8300: put bitsperlong.h in uapi Nicolas Dichtel ` (7 more replies) 0 siblings, 8 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-02 13:25 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo Here is the v5 of this series. Seems there was too many people cc'ed, so I've removed arch specific ml. Hope it's better now. Patches #1 and #2 are just cleanup: some exported headers were still under a non-uapi directory. Patch #3 is a fix to avoid exporting a file that was not under an uapi directory. After these three patches, all exported headers are under an uapi directory: path #4 stops searching files in non uapi directories. The patch #5 was spotted by code review: there is no in-tree user of this functionality. Patch #6 fixes some warnings/errors reported by 0-day tests. Patches #7 and #8 remove the need to list explicitly headers. Now all files under an uapi directory are exported. This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. If I must rebase it against the kbuild tree, just tell me. v4 -> v5: - patch #3: get back to v3 (don't export msr-index.h) - patch #6: new in this version - patch #7: fix compilation by introducing header-n v3 -> v4: - first patch has been included - patch #4: get back to v2 and remove arch/x86/include/asm/msr-index.h v2 -> v3: - patch #1: remove arch/arm/include/asm/types.h - patch #2: remove arch/h8300/include/asm/bitsperlong.h - patch #3: remove arch/nios2/include/uapi/asm/setup.h - patch #4: don't export msr-index.h - patch #5: fix a typo: s/unput-files3-name/input-files3-name - patch #6: no change - patch #7: fix include/uapi/asm-generic/Kbuild.asm by introducing mandatory-y - add patch #8 v1 -> v2: - add patch #1 to #6 - patch #7: remove use of header-y Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v5 1/8] h8300: put bitsperlong.h in uapi 2017-02-02 13:25 ` [PATCH v5 0/8] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-02-02 13:25 ` Nicolas Dichtel 2017-02-02 13:25 ` [PATCH v5 2/8] nios2: put setup.h " Nicolas Dichtel ` (6 subsequent siblings) 7 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-02 13:25 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 14 -------------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h deleted file mode 100644 index e140e46729ac..000000000000 --- a/arch/h8300/include/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __ASM_H8300_BITS_PER_LONG -#define __ASM_H8300_BITS_PER_LONG - -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif - -#endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v5 2/8] nios2: put setup.h in uapi 2017-02-02 13:25 ` [PATCH v5 0/8] uapi: export all headers under uapi directories Nicolas Dichtel 2017-02-02 13:25 ` [PATCH v5 1/8] h8300: put bitsperlong.h in uapi Nicolas Dichtel @ 2017-02-02 13:25 ` Nicolas Dichtel 2017-02-02 13:25 ` [PATCH v5 3/8] x86: stop exporting msr-index.h to userland Nicolas Dichtel ` (5 subsequent siblings) 7 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-02 13:25 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel This header file is exported, but from a userland pov, it's just a wrapper to asm-generic/setup.h. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: Tobias Klauser <tklauser@distanz.ch> --- arch/nios2/include/uapi/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..69c965304146 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -2,4 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h +generic-y += setup.h generic-y += ucontext.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v5 3/8] x86: stop exporting msr-index.h to userland 2017-02-02 13:25 ` [PATCH v5 0/8] uapi: export all headers under uapi directories Nicolas Dichtel 2017-02-02 13:25 ` [PATCH v5 1/8] h8300: put bitsperlong.h in uapi Nicolas Dichtel 2017-02-02 13:25 ` [PATCH v5 2/8] nios2: put setup.h " Nicolas Dichtel @ 2017-02-02 13:25 ` Nicolas Dichtel 2017-02-02 13:38 ` Ingo Molnar 2017-02-02 13:25 ` [PATCH v5 4/8] Makefile.headersinst: cleanup input files Nicolas Dichtel ` (4 subsequent siblings) 7 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-02 13:25 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel Even if this file was not in an uapi directory, it was exported because it was listed in the Kbuild file. Fixes: b72e7464e4cf ("x86/uapi: Do not export <asm/msr-index.h> as part of the user API headers") Suggested-by: Borislav Petkov <bp@alien8.de> CC: Ingo Molnar <mingo@kernel.org> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/x86/include/uapi/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..1c532b3f18ea 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -27,7 +27,6 @@ header-y += ldt.h header-y += mce.h header-y += mman.h header-y += msgbuf.h -header-y += msr-index.h header-y += msr.h header-y += mtrr.h header-y += param.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v5 3/8] x86: stop exporting msr-index.h to userland 2017-02-02 13:25 ` [PATCH v5 3/8] x86: stop exporting msr-index.h to userland Nicolas Dichtel @ 2017-02-02 13:38 ` Ingo Molnar 0 siblings, 0 replies; 554+ messages in thread From: Ingo Molnar @ 2017-02-02 13:38 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe * Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > Even if this file was not in an uapi directory, it was exported because > it was listed in the Kbuild file. > > Fixes: b72e7464e4cf ("x86/uapi: Do not export <asm/msr-index.h> as part of the user API headers") > Suggested-by: Borislav Petkov <bp@alien8.de> > CC: Ingo Molnar <mingo@kernel.org> > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > arch/x86/include/uapi/asm/Kbuild | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..1c532b3f18ea 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -27,7 +27,6 @@ header-y += ldt.h > header-y += mce.h > header-y += mman.h > header-y += msgbuf.h > -header-y += msr-index.h > header-y += msr.h > header-y += mtrr.h > header-y += param.h Acked-by: Ingo Molnar <mingo@kernel.org> Thanks, Ingo ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v5 4/8] Makefile.headersinst: cleanup input files 2017-02-02 13:25 ` [PATCH v5 0/8] uapi: export all headers under uapi directories Nicolas Dichtel ` (2 preceding siblings ...) 2017-02-02 13:25 ` [PATCH v5 3/8] x86: stop exporting msr-index.h to userland Nicolas Dichtel @ 2017-02-02 13:25 ` Nicolas Dichtel 2017-02-02 13:25 ` [PATCH v5 5/8] Makefile.headersinst: remove destination-y option Nicolas Dichtel ` (3 subsequent siblings) 7 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-02 13:25 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that input-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v5 5/8] Makefile.headersinst: remove destination-y option 2017-02-02 13:25 ` [PATCH v5 0/8] uapi: export all headers under uapi directories Nicolas Dichtel ` (3 preceding siblings ...) 2017-02-02 13:25 ` [PATCH v5 4/8] Makefile.headersinst: cleanup input files Nicolas Dichtel @ 2017-02-02 13:25 ` Nicolas Dichtel 2017-02-03 21:45 ` Paul Bolle 2017-02-02 13:25 ` [PATCH v5 6/8] uapi: includes linux/types.h before exporting files Nicolas Dichtel ` (2 subsequent siblings) 7 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-02 13:25 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v5 5/8] Makefile.headersinst: remove destination-y option 2017-02-02 13:25 ` [PATCH v5 5/8] Makefile.headersinst: remove destination-y option Nicolas Dichtel @ 2017-02-03 21:45 ` Paul Bolle 0 siblings, 0 replies; 554+ messages in thread From: Paul Bolle @ 2017-02-03 21:45 UTC (permalink / raw) To: Nicolas Dichtel, arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo On Thu, 2017-02-02 at 14:25 +0100, Nicolas Dichtel wrote: > This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y > for exported headers") but never used in-tree. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> I've got an identical patch in my ever growing stack of stuff that I should actually submit: Acked-by: Paul Bolle <pebolle@tiscali.nl> Thanks, Paul Bolle ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v5 6/8] uapi: includes linux/types.h before exporting files 2017-02-02 13:25 ` [PATCH v5 0/8] uapi: export all headers under uapi directories Nicolas Dichtel ` (4 preceding siblings ...) 2017-02-02 13:25 ` [PATCH v5 5/8] Makefile.headersinst: remove destination-y option Nicolas Dichtel @ 2017-02-02 13:25 ` Nicolas Dichtel 2017-02-02 15:15 ` kbuild test robot 2017-02-02 15:27 ` kbuild test robot 2017-02-02 13:25 ` [PATCH v5 7/8] uapi: export all headers under uapi directories Nicolas Dichtel 2017-02-02 13:25 ` [PATCH v5 " Nicolas Dichtel 7 siblings, 2 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-02 13:25 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel Some files will be exported after the next patch. 0-day tests report the following warning/error: ./usr/include/linux/bcache.h:8: include of <linux/types.h> is preferred over <asm/types.h> ./usr/include/linux/bcache.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/qrtr.h:8: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/cryptouser.h:39: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/media.h:29: included file 'linux/version.h' is not exported ./usr/include/linux/pr.h:14: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/btrfs_tree.h:337: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/seg6.h:21: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/seg6_hmac.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/uapi/linux/bcache.h | 2 +- include/uapi/linux/btrfs_tree.h | 2 ++ include/uapi/linux/cryptouser.h | 2 ++ include/uapi/linux/media.h | 1 - include/uapi/linux/pr.h | 2 ++ include/uapi/linux/seg6.h | 2 ++ 6 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h index 22b6ad31c706..e3bb0635e94a 100644 --- a/include/uapi/linux/bcache.h +++ b/include/uapi/linux/bcache.h @@ -5,7 +5,7 @@ * Bcache on disk data structures */ -#include <asm/types.h> +#include <linux/types.h> #define BITMASK(name, type, field, offset, size) \ static inline __u64 name(const type *k) \ diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h index d5ad15a106a7..6a261cb52d95 100644 --- a/include/uapi/linux/btrfs_tree.h +++ b/include/uapi/linux/btrfs_tree.h @@ -1,6 +1,8 @@ #ifndef _BTRFS_CTREE_H_ #define _BTRFS_CTREE_H_ +#include <linux/types.h> + /* * This header contains the structure definitions and constants used * by file system objects that can be retrieved using diff --git a/include/uapi/linux/cryptouser.h b/include/uapi/linux/cryptouser.h index 11d21fce14d6..c6a09c5261e7 100644 --- a/include/uapi/linux/cryptouser.h +++ b/include/uapi/linux/cryptouser.h @@ -18,6 +18,8 @@ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <linux/types.h> + /* Netlink configuration messages. */ enum { CRYPTO_MSG_BASE = 0x10, diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 4890787731b8..27c972903b3f 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -28,7 +28,6 @@ #endif #include <linux/ioctl.h> #include <linux/types.h> -#include <linux/version.h> #define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0) diff --git a/include/uapi/linux/pr.h b/include/uapi/linux/pr.h index 57d7c0f916b6..645ef3cf3dd0 100644 --- a/include/uapi/linux/pr.h +++ b/include/uapi/linux/pr.h @@ -1,6 +1,8 @@ #ifndef _UAPI_PR_H #define _UAPI_PR_H +#include <linux/types.h> + enum pr_type { PR_WRITE_EXCLUSIVE = 1, PR_EXCLUSIVE_ACCESS = 2, diff --git a/include/uapi/linux/seg6.h b/include/uapi/linux/seg6.h index c396a8052f73..33496595064c 100644 --- a/include/uapi/linux/seg6.h +++ b/include/uapi/linux/seg6.h @@ -14,6 +14,8 @@ #ifndef _UAPI_LINUX_SEG6_H #define _UAPI_LINUX_SEG6_H +#include <linux/types.h> + /* * SRH */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v5 6/8] uapi: includes linux/types.h before exporting files 2017-02-02 13:25 ` [PATCH v5 6/8] uapi: includes linux/types.h before exporting files Nicolas Dichtel 2017-02-02 15:15 ` kbuild test robot @ 2017-02-02 15:15 ` kbuild test robot 1 sibling, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-02-02 15:15 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 3236 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc6 next-20170202] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 config: i386-allmodconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386 All error/warnings (new ones prefixed by >>): In file included from drivers/media/media-device.c:30:0: drivers/media/media-device.c: In function 'media_device_get_info': >> include/uapi/linux/media.h:32:27: error: implicit declaration of function 'KERNEL_VERSION' [-Werror=implicit-function-declaration] #define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0) ^ >> drivers/media/media-device.c:76:24: note: in expansion of macro 'MEDIA_API_VERSION' info->media_version = MEDIA_API_VERSION; ^~~~~~~~~~~~~~~~~ drivers/media/media-device.c: In function 'media_device_pci_init': >> drivers/media/media-device.c:841:25: error: 'LINUX_VERSION_CODE' undeclared (first use in this function) mdev->driver_version = LINUX_VERSION_CODE; ^~~~~~~~~~~~~~~~~~ drivers/media/media-device.c:841:25: note: each undeclared identifier is reported only once for each function it appears in drivers/media/media-device.c: In function '__media_device_usb_init': drivers/media/media-device.c:870:25: error: 'LINUX_VERSION_CODE' undeclared (first use in this function) mdev->driver_version = LINUX_VERSION_CODE; ^~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors vim +/KERNEL_VERSION +32 include/uapi/linux/media.h b3b7a9f1 include/uapi/linux/media.h Mauro Carvalho Chehab 2015-12-11 26 #ifndef __KERNEL__ b3b7a9f1 include/uapi/linux/media.h Mauro Carvalho Chehab 2015-12-11 27 #include <stdint.h> b3b7a9f1 include/uapi/linux/media.h Mauro Carvalho Chehab 2015-12-11 28 #endif 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 29 #include <linux/ioctl.h> 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 30 #include <linux/types.h> 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 31 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 @32 #define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0) 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 33 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 34 struct media_device_info { 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 35 char driver[16]; :::::: The code at line 32 was first introduced by commit :::::: 140d88165c25137e871f9559e67986ed89251105 [media] media: Media device information query :::::: TO: Laurent Pinchart <laurent.pinchart@ideasonboard.com> :::::: CC: Mauro Carvalho Chehab <mchehab@redhat.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 57920 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v5 6/8] uapi: includes linux/types.h before exporting files @ 2017-02-02 15:15 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-02-02 15:15 UTC (permalink / raw) Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 3236 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc6 next-20170202] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 config: i386-allmodconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386 All error/warnings (new ones prefixed by >>): In file included from drivers/media/media-device.c:30:0: drivers/media/media-device.c: In function 'media_device_get_info': >> include/uapi/linux/media.h:32:27: error: implicit declaration of function 'KERNEL_VERSION' [-Werror=implicit-function-declaration] #define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0) ^ >> drivers/media/media-device.c:76:24: note: in expansion of macro 'MEDIA_API_VERSION' info->media_version = MEDIA_API_VERSION; ^~~~~~~~~~~~~~~~~ drivers/media/media-device.c: In function 'media_device_pci_init': >> drivers/media/media-device.c:841:25: error: 'LINUX_VERSION_CODE' undeclared (first use in this function) mdev->driver_version = LINUX_VERSION_CODE; ^~~~~~~~~~~~~~~~~~ drivers/media/media-device.c:841:25: note: each undeclared identifier is reported only once for each function it appears in drivers/media/media-device.c: In function '__media_device_usb_init': drivers/media/media-device.c:870:25: error: 'LINUX_VERSION_CODE' undeclared (first use in this function) mdev->driver_version = LINUX_VERSION_CODE; ^~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors vim +/KERNEL_VERSION +32 include/uapi/linux/media.h b3b7a9f1 include/uapi/linux/media.h Mauro Carvalho Chehab 2015-12-11 26 #ifndef __KERNEL__ b3b7a9f1 include/uapi/linux/media.h Mauro Carvalho Chehab 2015-12-11 27 #include <stdint.h> b3b7a9f1 include/uapi/linux/media.h Mauro Carvalho Chehab 2015-12-11 28 #endif 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 29 #include <linux/ioctl.h> 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 30 #include <linux/types.h> 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 31 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 @32 #define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0) 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 33 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 34 struct media_device_info { 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 35 char driver[16]; :::::: The code at line 32 was first introduced by commit :::::: 140d88165c25137e871f9559e67986ed89251105 [media] media: Media device information query :::::: TO: Laurent Pinchart <laurent.pinchart@ideasonboard.com> :::::: CC: Mauro Carvalho Chehab <mchehab@redhat.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 57920 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v5 6/8] uapi: includes linux/types.h before exporting files @ 2017-02-02 15:15 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-02-02 15:15 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo [-- Attachment #1: Type: text/plain, Size: 3236 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc6 next-20170202] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 config: i386-allmodconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386 All error/warnings (new ones prefixed by >>): In file included from drivers/media/media-device.c:30:0: drivers/media/media-device.c: In function 'media_device_get_info': >> include/uapi/linux/media.h:32:27: error: implicit declaration of function 'KERNEL_VERSION' [-Werror=implicit-function-declaration] #define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0) ^ >> drivers/media/media-device.c:76:24: note: in expansion of macro 'MEDIA_API_VERSION' info->media_version = MEDIA_API_VERSION; ^~~~~~~~~~~~~~~~~ drivers/media/media-device.c: In function 'media_device_pci_init': >> drivers/media/media-device.c:841:25: error: 'LINUX_VERSION_CODE' undeclared (first use in this function) mdev->driver_version = LINUX_VERSION_CODE; ^~~~~~~~~~~~~~~~~~ drivers/media/media-device.c:841:25: note: each undeclared identifier is reported only once for each function it appears in drivers/media/media-device.c: In function '__media_device_usb_init': drivers/media/media-device.c:870:25: error: 'LINUX_VERSION_CODE' undeclared (first use in this function) mdev->driver_version = LINUX_VERSION_CODE; ^~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors vim +/KERNEL_VERSION +32 include/uapi/linux/media.h b3b7a9f1 include/uapi/linux/media.h Mauro Carvalho Chehab 2015-12-11 26 #ifndef __KERNEL__ b3b7a9f1 include/uapi/linux/media.h Mauro Carvalho Chehab 2015-12-11 27 #include <stdint.h> b3b7a9f1 include/uapi/linux/media.h Mauro Carvalho Chehab 2015-12-11 28 #endif 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 29 #include <linux/ioctl.h> 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 30 #include <linux/types.h> 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 31 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 @32 #define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0) 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 33 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 34 struct media_device_info { 140d8816 include/linux/media.h Laurent Pinchart 2010-08-18 35 char driver[16]; :::::: The code at line 32 was first introduced by commit :::::: 140d88165c25137e871f9559e67986ed89251105 [media] media: Media device information query :::::: TO: Laurent Pinchart <laurent.pinchart@ideasonboard.com> :::::: CC: Mauro Carvalho Chehab <mchehab@redhat.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 57920 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v5 6/8] uapi: includes linux/types.h before exporting files 2017-02-02 13:25 ` [PATCH v5 6/8] uapi: includes linux/types.h before exporting files Nicolas Dichtel 2017-02-02 15:15 ` kbuild test robot @ 2017-02-02 15:27 ` kbuild test robot 1 sibling, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-02-02 15:27 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 2813 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc6] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 config: x86_64-randconfig-n0-02022216 (attached as .config) compiler: gcc-4.8 (Debian 4.8.4-1) 4.8.4 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): drivers/media/media-device.c: In function 'media_device_get_info': >> drivers/media/media-device.c:76:2: error: implicit declaration of function 'KERNEL_VERSION' [-Werror=implicit-function-declaration] info->media_version = MEDIA_API_VERSION; ^ drivers/media/media-device.c: In function 'media_device_pci_init': drivers/media/media-device.c:841:25: error: 'LINUX_VERSION_CODE' undeclared (first use in this function) mdev->driver_version = LINUX_VERSION_CODE; ^ drivers/media/media-device.c:841:25: note: each undeclared identifier is reported only once for each function it appears in drivers/media/media-device.c: In function '__media_device_usb_init': drivers/media/media-device.c:870:25: error: 'LINUX_VERSION_CODE' undeclared (first use in this function) mdev->driver_version = LINUX_VERSION_CODE; ^ cc1: some warnings being treated as errors vim +/KERNEL_VERSION +76 drivers/media/media-device.c bcd5081b Sakari Ailus 2016-05-03 70 sizeof(info->driver)); bb07bd6b Mauro Carvalho Chehab 2016-02-11 71 bcd5081b Sakari Ailus 2016-05-03 72 strlcpy(info->model, dev->model, sizeof(info->model)); bcd5081b Sakari Ailus 2016-05-03 73 strlcpy(info->serial, dev->serial, sizeof(info->serial)); bcd5081b Sakari Ailus 2016-05-03 74 strlcpy(info->bus_info, dev->bus_info, sizeof(info->bus_info)); 140d8816 Laurent Pinchart 2010-08-18 75 bcd5081b Sakari Ailus 2016-05-03 @76 info->media_version = MEDIA_API_VERSION; bcd5081b Sakari Ailus 2016-05-03 77 info->hw_revision = dev->hw_revision; bcd5081b Sakari Ailus 2016-05-03 78 info->driver_version = dev->driver_version; 140d8816 Laurent Pinchart 2010-08-18 79 :::::: The code at line 76 was first introduced by commit :::::: bcd5081b05367d108c1380369c698a4601c41cfc [media] media: Refactor copying IOCTL arguments from and to user space :::::: TO: Sakari Ailus <sakari.ailus@linux.intel.com> :::::: CC: Mauro Carvalho Chehab <mchehab@s-opensource.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 24716 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v5 6/8] uapi: includes linux/types.h before exporting files @ 2017-02-02 15:27 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-02-02 15:27 UTC (permalink / raw) Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 2813 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc6] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 config: x86_64-randconfig-n0-02022216 (attached as .config) compiler: gcc-4.8 (Debian 4.8.4-1) 4.8.4 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): drivers/media/media-device.c: In function 'media_device_get_info': >> drivers/media/media-device.c:76:2: error: implicit declaration of function 'KERNEL_VERSION' [-Werror=implicit-function-declaration] info->media_version = MEDIA_API_VERSION; ^ drivers/media/media-device.c: In function 'media_device_pci_init': drivers/media/media-device.c:841:25: error: 'LINUX_VERSION_CODE' undeclared (first use in this function) mdev->driver_version = LINUX_VERSION_CODE; ^ drivers/media/media-device.c:841:25: note: each undeclared identifier is reported only once for each function it appears in drivers/media/media-device.c: In function '__media_device_usb_init': drivers/media/media-device.c:870:25: error: 'LINUX_VERSION_CODE' undeclared (first use in this function) mdev->driver_version = LINUX_VERSION_CODE; ^ cc1: some warnings being treated as errors vim +/KERNEL_VERSION +76 drivers/media/media-device.c bcd5081b Sakari Ailus 2016-05-03 70 sizeof(info->driver)); bb07bd6b Mauro Carvalho Chehab 2016-02-11 71 bcd5081b Sakari Ailus 2016-05-03 72 strlcpy(info->model, dev->model, sizeof(info->model)); bcd5081b Sakari Ailus 2016-05-03 73 strlcpy(info->serial, dev->serial, sizeof(info->serial)); bcd5081b Sakari Ailus 2016-05-03 74 strlcpy(info->bus_info, dev->bus_info, sizeof(info->bus_info)); 140d8816 Laurent Pinchart 2010-08-18 75 bcd5081b Sakari Ailus 2016-05-03 @76 info->media_version = MEDIA_API_VERSION; bcd5081b Sakari Ailus 2016-05-03 77 info->hw_revision = dev->hw_revision; bcd5081b Sakari Ailus 2016-05-03 78 info->driver_version = dev->driver_version; 140d8816 Laurent Pinchart 2010-08-18 79 :::::: The code at line 76 was first introduced by commit :::::: bcd5081b05367d108c1380369c698a4601c41cfc [media] media: Refactor copying IOCTL arguments from and to user space :::::: TO: Sakari Ailus <sakari.ailus@linux.intel.com> :::::: CC: Mauro Carvalho Chehab <mchehab@s-opensource.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 24716 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v5 6/8] uapi: includes linux/types.h before exporting files @ 2017-02-02 15:27 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-02-02 15:27 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo [-- Attachment #1: Type: text/plain, Size: 2813 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc6] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 config: x86_64-randconfig-n0-02022216 (attached as .config) compiler: gcc-4.8 (Debian 4.8.4-1) 4.8.4 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): drivers/media/media-device.c: In function 'media_device_get_info': >> drivers/media/media-device.c:76:2: error: implicit declaration of function 'KERNEL_VERSION' [-Werror=implicit-function-declaration] info->media_version = MEDIA_API_VERSION; ^ drivers/media/media-device.c: In function 'media_device_pci_init': drivers/media/media-device.c:841:25: error: 'LINUX_VERSION_CODE' undeclared (first use in this function) mdev->driver_version = LINUX_VERSION_CODE; ^ drivers/media/media-device.c:841:25: note: each undeclared identifier is reported only once for each function it appears in drivers/media/media-device.c: In function '__media_device_usb_init': drivers/media/media-device.c:870:25: error: 'LINUX_VERSION_CODE' undeclared (first use in this function) mdev->driver_version = LINUX_VERSION_CODE; ^ cc1: some warnings being treated as errors vim +/KERNEL_VERSION +76 drivers/media/media-device.c bcd5081b Sakari Ailus 2016-05-03 70 sizeof(info->driver)); bb07bd6b Mauro Carvalho Chehab 2016-02-11 71 bcd5081b Sakari Ailus 2016-05-03 72 strlcpy(info->model, dev->model, sizeof(info->model)); bcd5081b Sakari Ailus 2016-05-03 73 strlcpy(info->serial, dev->serial, sizeof(info->serial)); bcd5081b Sakari Ailus 2016-05-03 74 strlcpy(info->bus_info, dev->bus_info, sizeof(info->bus_info)); 140d8816 Laurent Pinchart 2010-08-18 75 bcd5081b Sakari Ailus 2016-05-03 @76 info->media_version = MEDIA_API_VERSION; bcd5081b Sakari Ailus 2016-05-03 77 info->hw_revision = dev->hw_revision; bcd5081b Sakari Ailus 2016-05-03 78 info->driver_version = dev->driver_version; 140d8816 Laurent Pinchart 2010-08-18 79 :::::: The code at line 76 was first introduced by commit :::::: bcd5081b05367d108c1380369c698a4601c41cfc [media] media: Refactor copying IOCTL arguments from and to user space :::::: TO: Sakari Ailus <sakari.ailus@linux.intel.com> :::::: CC: Mauro Carvalho Chehab <mchehab@s-opensource.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 24716 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v5 7/8] uapi: export all headers under uapi directories 2017-02-02 13:25 ` [PATCH v5 0/8] uapi: export all headers under uapi directories Nicolas Dichtel ` (5 preceding siblings ...) 2017-02-02 13:25 ` [PATCH v5 6/8] uapi: includes linux/types.h before exporting files Nicolas Dichtel @ 2017-02-02 13:25 ` Nicolas Dichtel 2017-02-02 14:47 ` kbuild test robot 2017-02-02 13:25 ` [PATCH v5 " Nicolas Dichtel 7 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-02 13:25 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-arc/kvm_para.h asm-arc/ucontext.h asm-avr32/kvm_para.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-c6x/shmparam.h asm-c6x/ucontext.h asm-cris/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-hexagon/shmparam.h asm-m32r/kvm_para.h asm-m68k/kvm_para.h asm-m68k/shmparam.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-mips/hwcap.h asm-mips/reg.h asm-mips/ucontext.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-openrisc/shmparam.h asm-parisc/kvm_para.h asm-powerpc/perf_regs.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-tile/shmparam.h asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-xtensa/kvm_para.h drm/armada_drm.h drm/etnaviv_drm.h drm/omap_drm.h drm/vgem_drm.h linux/auto_dev-ioctl.h linux/batman_adv.h linux/bcache.h linux/btrfs_tree.h linux/cifs linux/cifs/..install.cmd linux/cifs/.install linux/cifs/cifs_mount.h linux/coresight-stm.h linux/cryptouser.h linux/dma-buf.h linux/genwqe linux/genwqe/..install.cmd linux/genwqe/.install linux/genwqe/genwqe_card.h linux/hash_info.h linux/kcm.h linux/kcov.h linux/kfd_ioctl.h linux/lightnvm.h linux/module.h linux/nilfs2_api.h linux/nilfs2_ondisk.h linux/nsfs.h linux/pr.h linux/qrtr.h linux/seg6.h linux/seg6_genl.h linux/seg6_hmac.h linux/seg6_iptunnel.h linux/stm.h linux/userio.h linux/wil6210_uapi.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. For the record, note that exported files for asm directories are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/<arch>/include/uapi/asm/Kbuild; - arch/<arch>/include/asm/Kbuild. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Mark Salter <msalter@redhat.com> Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) --- Documentation/kbuild/makefiles.txt | 66 ++-- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 3 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 58 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 485 +--------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 19 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 46 +-- 81 files changed, 111 insertions(+), 1741 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..91ffb391ed54 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,10 +44,12 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 header-n --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y + --- 7.5 mandatory-y + --- 7.6 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1235,7 +1237,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1264,30 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. -See subsequent chapter for the syntax of the Kbuild file. - - --- 7.1 header-y - - header-y specifies header files to be exported. - - Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. - The convention is to list one file per line and - preferably in alphabetic order. +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. +See subsequent chapter for the syntax of the Kbuild file. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. + --- 7.1 header-n - Subdirectories are visited before their parent directories. + header-n is essentially used by include/uapi/linux/Kbuild to avoid + exporting specific headers (e.g. kvm.h) on architectures that do not + support it. It should be avoided as much as possible. --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y @@ -1334,6 +1329,27 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h + --- 7.5 mandatory-y + + mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm + to define the minimun set of headers that must be exported in + include/asm. + + The convention is to list one subdir per line and + preferably in alphabetic order. + + --- 7.6 subdir-y + + subdir-y may be used to specify a subdirectory to be exported. + + Example: + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ + + The convention is to list one subdir per line and + preferably in alphabetic order. + === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 69c965304146..374bd123329f 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,6 +1,5 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h - generic-y += setup.h generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y += - - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 1c532b3f18ea..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,61 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..8e6b335664f2 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +mandatory-y += auxvec.h +mandatory-y += bitsperlong.h +mandatory-y += byteorder.h +mandatory-y += errno.h +mandatory-y += fcntl.h +mandatory-y += ioctl.h +mandatory-y += ioctls.h +mandatory-y += ipcbuf.h +mandatory-y += mman.h +mandatory-y += msgbuf.h +mandatory-y += param.h +mandatory-y += poll.h +mandatory-y += posix_types.h +mandatory-y += ptrace.h +mandatory-y += resource.h +mandatory-y += sembuf.h +mandatory-y += setup.h +mandatory-y += shmbuf.h +mandatory-y += sigcontext.h +mandatory-y += siginfo.h +mandatory-y += signal.h +mandatory-y += socket.h +mandatory-y += sockios.h +mandatory-y += stat.h +mandatory-y += statfs.h +mandatory-y += swab.h +mandatory-y += termbits.h +mandatory-y += termios.h +mandatory-y += types.h +mandatory-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +mandatory-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index f330ba4547cf..456cbe8a2aad 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -1,483 +1,16 @@ # UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) +header-n += a.out.h endif -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) +header-n += kvm.h endif - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) +header-n += kvm_para.h endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += timerfd.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index bb68cb1b04ed..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,19 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h -header-y += qedr-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..c96805a7f48b 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,19 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +27,13 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +header-files := $(filter-out $(header-n), $(header-files)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,25 +41,23 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) +ifneq ($(mandatory-y),) +missing := $(filter-out $(all-files),$(mandatory-y)) +ifneq ($(missing),) +$(error Some mandatory headers ($(missing)) are missing in $(obj)) +endif +endif # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -67,8 +71,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v5 7/8] uapi: export all headers under uapi directories 2017-02-02 13:25 ` [PATCH v5 7/8] uapi: export all headers under uapi directories Nicolas Dichtel 2017-02-02 14:47 ` kbuild test robot @ 2017-02-02 14:47 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-02-02 14:47 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 1191 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc6] [cannot apply to next-20170202] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 config: i386-tinyconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386 Note: the linux-review/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 HEAD fec8d2b493885de70b229c7ce5bf917dc92ddb9f builds fine. It only hurts bisectibility. All errors (new ones prefixed by >>): >> ./usr/include/asm/unistd.h:8: included file 'asm-x86/unistd_32.h' is not exported >> ./usr/include/asm/unistd.h:10: included file 'asm-x86/unistd_x32.h' is not exported >> ./usr/include/asm/unistd.h:12: included file 'asm-x86/unistd_64.h' is not exported --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 6397 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v5 7/8] uapi: export all headers under uapi directories @ 2017-02-02 14:47 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-02-02 14:47 UTC (permalink / raw) Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 1191 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc6] [cannot apply to next-20170202] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 config: i386-tinyconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386 Note: the linux-review/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 HEAD fec8d2b493885de70b229c7ce5bf917dc92ddb9f builds fine. It only hurts bisectibility. All errors (new ones prefixed by >>): >> ./usr/include/asm/unistd.h:8: included file 'asm-x86/unistd_32.h' is not exported >> ./usr/include/asm/unistd.h:10: included file 'asm-x86/unistd_x32.h' is not exported >> ./usr/include/asm/unistd.h:12: included file 'asm-x86/unistd_64.h' is not exported --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 6397 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v5 7/8] uapi: export all headers under uapi directories @ 2017-02-02 14:47 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-02-02 14:47 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo [-- Attachment #1: Type: text/plain, Size: 1191 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc6] [cannot apply to next-20170202] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 config: i386-tinyconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386 Note: the linux-review/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 HEAD fec8d2b493885de70b229c7ce5bf917dc92ddb9f builds fine. It only hurts bisectibility. All errors (new ones prefixed by >>): >> ./usr/include/asm/unistd.h:8: included file 'asm-x86/unistd_32.h' is not exported >> ./usr/include/asm/unistd.h:10: included file 'asm-x86/unistd_x32.h' is not exported >> ./usr/include/asm/unistd.h:12: included file 'asm-x86/unistd_64.h' is not exported --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 6397 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v5 7/8] uapi: export all headers under uapi directories 2017-02-02 14:47 ` kbuild test robot (?) (?) @ 2017-02-02 15:42 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-02 15:42 UTC (permalink / raw) To: kbuild test robot Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo Le 02/02/2017 à 15:47, kbuild test robot a écrit : > Hi Nicolas, > > [auto build test ERROR on linus/master] > [also build test ERROR on v4.10-rc6] > [cannot apply to next-20170202] > [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] > > url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 > config: i386-tinyconfig (attached as .config) > compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 > reproduce: > # save the attached .config to linux build tree > make ARCH=i386 > > Note: the linux-review/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 HEAD fec8d2b493885de70b229c7ce5bf917dc92ddb9f builds fine. > It only hurts bisectibility. > > All errors (new ones prefixed by >>): > >>> ./usr/include/asm/unistd.h:8: included file 'asm-x86/unistd_32.h' is not exported >>> ./usr/include/asm/unistd.h:10: included file 'asm-x86/unistd_x32.h' is not exported >>> ./usr/include/asm/unistd.h:12: included file 'asm-x86/unistd_64.h' is not exported I don't reproduce this error, it compiles on my target (gcc 4.9.2). Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v6 0/8] uapi: export all headers under uapi directories 2017-02-02 14:47 ` kbuild test robot ` (2 preceding siblings ...) (?) @ 2017-02-10 10:58 ` Nicolas Dichtel 2017-02-10 10:58 ` [PATCH v6 1/8] h8300: put bitsperlong.h in uapi Nicolas Dichtel ` (7 more replies) -1 siblings, 8 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-10 10:58 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo Here is the v6 of this series. Patches #1 and #2 are just cleanup: some exported headers were still under a non-uapi directory. Patch #3 is a fix to avoid exporting a file that was not under an uapi directory. After these three patches, all exported headers are under an uapi directory: path #4 stops searching files in non uapi directories. The patch #5 was spotted by code review: there is no in-tree user of this functionality. Patch #6 fixes some warnings/errors reported by 0-day tests. Patches #7 and #8 remove the need to list explicitly headers. Now all files under an uapi directory are exported. This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. If I must rebase it against the kbuild tree, just tell me. FYI, I will be off for 10 days. v5 -> v6: - patch #6: remove change of include/uapi/linux/media.h - patch #7: fix hdr export when 'make O=' is used (look for genhdr files in the right directory) - patch #8: fix 'make headers_check' v4 -> v5: - patch #3: get back to v3 (don't export msr-index.h) - patch #6: new in this version - patch #7: fix compilation by introducing header-n v3 -> v4: - first patch has been included - patch #4: get back to v2 and remove arch/x86/include/asm/msr-index.h v2 -> v3: - patch #1: remove arch/arm/include/asm/types.h - patch #2: remove arch/h8300/include/asm/bitsperlong.h - patch #3: remove arch/nios2/include/uapi/asm/setup.h - patch #4: don't export msr-index.h - patch #5: fix a typo: s/unput-files3-name/input-files3-name - patch #6: no change - patch #7: fix include/uapi/asm-generic/Kbuild.asm by introducing mandatory-y - add patch #8 v1 -> v2: - add patch #1 to #6 - patch #7: remove use of header-y Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v6 1/8] h8300: put bitsperlong.h in uapi 2017-02-10 10:58 ` [PATCH v6 0/8] " Nicolas Dichtel @ 2017-02-10 10:58 ` Nicolas Dichtel 2017-02-10 10:58 ` [PATCH v6 2/8] nios2: put setup.h " Nicolas Dichtel ` (6 subsequent siblings) 7 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-10 10:58 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 14 -------------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h deleted file mode 100644 index e140e46729ac..000000000000 --- a/arch/h8300/include/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __ASM_H8300_BITS_PER_LONG -#define __ASM_H8300_BITS_PER_LONG - -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif - -#endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v6 2/8] nios2: put setup.h in uapi 2017-02-10 10:58 ` [PATCH v6 0/8] " Nicolas Dichtel 2017-02-10 10:58 ` [PATCH v6 1/8] h8300: put bitsperlong.h in uapi Nicolas Dichtel @ 2017-02-10 10:58 ` Nicolas Dichtel 2017-02-10 10:58 ` [PATCH v6 3/8] x86: stop exporting msr-index.h to userland Nicolas Dichtel ` (5 subsequent siblings) 7 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-10 10:58 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel This header file is exported, but from a userland pov, it's just a wrapper to asm-generic/setup.h. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: Tobias Klauser <tklauser@distanz.ch> --- arch/nios2/include/uapi/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..69c965304146 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -2,4 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h +generic-y += setup.h generic-y += ucontext.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v6 3/8] x86: stop exporting msr-index.h to userland 2017-02-10 10:58 ` [PATCH v6 0/8] " Nicolas Dichtel 2017-02-10 10:58 ` [PATCH v6 1/8] h8300: put bitsperlong.h in uapi Nicolas Dichtel 2017-02-10 10:58 ` [PATCH v6 2/8] nios2: put setup.h " Nicolas Dichtel @ 2017-02-10 10:58 ` Nicolas Dichtel 2017-02-10 11:15 ` Thomas Gleixner 2017-02-10 10:58 ` [PATCH v6 4/8] Makefile.headersinst: cleanup input files Nicolas Dichtel ` (4 subsequent siblings) 7 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-10 10:58 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel Even if this file was not in an uapi directory, it was exported because it was listed in the Kbuild file. Fixes: b72e7464e4cf ("x86/uapi: Do not export <asm/msr-index.h> as part of the user API headers") Suggested-by: Borislav Petkov <bp@alien8.de> CC: Ingo Molnar <mingo@kernel.org> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Ingo Molnar <mingo@kernel.org> --- arch/x86/include/uapi/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..1c532b3f18ea 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -27,7 +27,6 @@ header-y += ldt.h header-y += mce.h header-y += mman.h header-y += msgbuf.h -header-y += msr-index.h header-y += msr.h header-y += mtrr.h header-y += param.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v6 3/8] x86: stop exporting msr-index.h to userland 2017-02-10 10:58 ` [PATCH v6 3/8] x86: stop exporting msr-index.h to userland Nicolas Dichtel @ 2017-02-10 11:15 ` Thomas Gleixner 0 siblings, 0 replies; 554+ messages in thread From: Thomas Gleixner @ 2017-02-10 11:15 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo On Fri, 10 Feb 2017, Nicolas Dichtel wrote: > Even if this file was not in an uapi directory, it was exported because > it was listed in the Kbuild file. > > Fixes: b72e7464e4cf ("x86/uapi: Do not export <asm/msr-index.h> as part of the user API headers") > Suggested-by: Borislav Petkov <bp@alien8.de> > CC: Ingo Molnar <mingo@kernel.org> > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > Acked-by: Ingo Molnar <mingo@kernel.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> > --- > arch/x86/include/uapi/asm/Kbuild | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild > index 3dec769cadf7..1c532b3f18ea 100644 > --- a/arch/x86/include/uapi/asm/Kbuild > +++ b/arch/x86/include/uapi/asm/Kbuild > @@ -27,7 +27,6 @@ header-y += ldt.h > header-y += mce.h > header-y += mman.h > header-y += msgbuf.h > -header-y += msr-index.h > header-y += msr.h > header-y += mtrr.h > header-y += param.h > -- > 2.8.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-arch" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v6 4/8] Makefile.headersinst: cleanup input files 2017-02-10 10:58 ` [PATCH v6 0/8] " Nicolas Dichtel ` (2 preceding siblings ...) 2017-02-10 10:58 ` [PATCH v6 3/8] x86: stop exporting msr-index.h to userland Nicolas Dichtel @ 2017-02-10 10:58 ` Nicolas Dichtel 2017-02-10 10:58 ` [PATCH v6 5/8] Makefile.headersinst: remove destination-y option Nicolas Dichtel ` (3 subsequent siblings) 7 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-10 10:58 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that input-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v6 5/8] Makefile.headersinst: remove destination-y option 2017-02-10 10:58 ` [PATCH v6 0/8] " Nicolas Dichtel ` (3 preceding siblings ...) 2017-02-10 10:58 ` [PATCH v6 4/8] Makefile.headersinst: cleanup input files Nicolas Dichtel @ 2017-02-10 10:58 ` Nicolas Dichtel 2017-02-10 10:58 ` [PATCH v6 6/8] uapi: includes linux/types.h before exporting files Nicolas Dichtel ` (2 subsequent siblings) 7 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-10 10:58 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Paul Bolle <pebolle@tiscali.nl> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v6 6/8] uapi: includes linux/types.h before exporting files 2017-02-10 10:58 ` [PATCH v6 0/8] " Nicolas Dichtel ` (4 preceding siblings ...) 2017-02-10 10:58 ` [PATCH v6 5/8] Makefile.headersinst: remove destination-y option Nicolas Dichtel @ 2017-02-10 10:58 ` Nicolas Dichtel 2017-02-10 10:58 ` [PATCH v6 7/8] uapi: export all headers under uapi directories Nicolas Dichtel 2017-02-10 10:58 ` [PATCH v6 " Nicolas Dichtel 7 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-10 10:58 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel Some files will be exported after the next patch. 0-day tests report the following warning/error: ./usr/include/linux/bcache.h:8: include of <linux/types.h> is preferred over <asm/types.h> ./usr/include/linux/bcache.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/qrtr.h:8: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/cryptouser.h:39: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/pr.h:14: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/btrfs_tree.h:337: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/seg6.h:21: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/seg6_hmac.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/uapi/linux/bcache.h | 2 +- include/uapi/linux/btrfs_tree.h | 2 ++ include/uapi/linux/cryptouser.h | 2 ++ include/uapi/linux/pr.h | 2 ++ include/uapi/linux/qrtr.h | 1 + include/uapi/linux/seg6.h | 2 ++ 6 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h index 22b6ad31c706..e3bb0635e94a 100644 --- a/include/uapi/linux/bcache.h +++ b/include/uapi/linux/bcache.h @@ -5,7 +5,7 @@ * Bcache on disk data structures */ -#include <asm/types.h> +#include <linux/types.h> #define BITMASK(name, type, field, offset, size) \ static inline __u64 name(const type *k) \ diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h index d5ad15a106a7..6a261cb52d95 100644 --- a/include/uapi/linux/btrfs_tree.h +++ b/include/uapi/linux/btrfs_tree.h @@ -1,6 +1,8 @@ #ifndef _BTRFS_CTREE_H_ #define _BTRFS_CTREE_H_ +#include <linux/types.h> + /* * This header contains the structure definitions and constants used * by file system objects that can be retrieved using diff --git a/include/uapi/linux/cryptouser.h b/include/uapi/linux/cryptouser.h index 11d21fce14d6..c6a09c5261e7 100644 --- a/include/uapi/linux/cryptouser.h +++ b/include/uapi/linux/cryptouser.h @@ -18,6 +18,8 @@ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <linux/types.h> + /* Netlink configuration messages. */ enum { CRYPTO_MSG_BASE = 0x10, diff --git a/include/uapi/linux/pr.h b/include/uapi/linux/pr.h index 57d7c0f916b6..645ef3cf3dd0 100644 --- a/include/uapi/linux/pr.h +++ b/include/uapi/linux/pr.h @@ -1,6 +1,8 @@ #ifndef _UAPI_PR_H #define _UAPI_PR_H +#include <linux/types.h> + enum pr_type { PR_WRITE_EXCLUSIVE = 1, PR_EXCLUSIVE_ACCESS = 2, diff --git a/include/uapi/linux/qrtr.h b/include/uapi/linux/qrtr.h index 66c0748d26e2..b14ee91ec387 100644 --- a/include/uapi/linux/qrtr.h +++ b/include/uapi/linux/qrtr.h @@ -1,6 +1,7 @@ #ifndef _LINUX_QRTR_H #define _LINUX_QRTR_H +#include <linux/types.h> #include <linux/socket.h> struct sockaddr_qrtr { diff --git a/include/uapi/linux/seg6.h b/include/uapi/linux/seg6.h index 052799e4d751..61df8d392f41 100644 --- a/include/uapi/linux/seg6.h +++ b/include/uapi/linux/seg6.h @@ -14,6 +14,8 @@ #ifndef _UAPI_LINUX_SEG6_H #define _UAPI_LINUX_SEG6_H +#include <linux/types.h> + /* * SRH */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v6 7/8] uapi: export all headers under uapi directories 2017-02-10 10:58 ` [PATCH v6 0/8] " Nicolas Dichtel ` (5 preceding siblings ...) 2017-02-10 10:58 ` [PATCH v6 6/8] uapi: includes linux/types.h before exporting files Nicolas Dichtel @ 2017-02-10 10:58 ` Nicolas Dichtel 2017-02-13 7:49 ` Christoph Hellwig 2017-02-10 10:58 ` [PATCH v6 " Nicolas Dichtel 7 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-10 10:58 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-arc/kvm_para.h asm-arc/ucontext.h asm-avr32/kvm_para.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-c6x/shmparam.h asm-c6x/ucontext.h asm-cris/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-hexagon/shmparam.h asm-m32r/kvm_para.h asm-m68k/kvm_para.h asm-m68k/shmparam.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-mips/hwcap.h asm-mips/reg.h asm-mips/ucontext.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-openrisc/shmparam.h asm-parisc/kvm_para.h asm-powerpc/perf_regs.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-tile/shmparam.h asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-xtensa/kvm_para.h drm/armada_drm.h drm/etnaviv_drm.h drm/omap_drm.h drm/vgem_drm.h linux/auto_dev-ioctl.h linux/batman_adv.h linux/bcache.h linux/btrfs_tree.h linux/cifs linux/cifs/..install.cmd linux/cifs/.install linux/cifs/cifs_mount.h linux/coresight-stm.h linux/cryptouser.h linux/dma-buf.h linux/genwqe linux/genwqe/..install.cmd linux/genwqe/.install linux/genwqe/genwqe_card.h linux/hash_info.h linux/kcm.h linux/kcov.h linux/kfd_ioctl.h linux/lightnvm.h linux/module.h linux/nilfs2_api.h linux/nilfs2_ondisk.h linux/nsfs.h linux/pr.h linux/qrtr.h linux/seg6.h linux/seg6_genl.h linux/seg6_hmac.h linux/seg6_iptunnel.h linux/stm.h linux/userio.h linux/wil6210_uapi.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. For the record, note that exported files for asm directories are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/<arch>/include/uapi/asm/Kbuild; - arch/<arch>/include/asm/Kbuild. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Mark Salter <msalter@redhat.com> Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) --- Documentation/kbuild/makefiles.txt | 66 ++-- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 3 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 58 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 485 +--------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 19 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 51 +-- 81 files changed, 113 insertions(+), 1744 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..91ffb391ed54 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,10 +44,12 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 header-n --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y + --- 7.5 mandatory-y + --- 7.6 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1235,7 +1237,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1264,30 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. -See subsequent chapter for the syntax of the Kbuild file. - - --- 7.1 header-y - - header-y specifies header files to be exported. - - Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. - The convention is to list one file per line and - preferably in alphabetic order. +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. +See subsequent chapter for the syntax of the Kbuild file. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. + --- 7.1 header-n - Subdirectories are visited before their parent directories. + header-n is essentially used by include/uapi/linux/Kbuild to avoid + exporting specific headers (e.g. kvm.h) on architectures that do not + support it. It should be avoided as much as possible. --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y @@ -1334,6 +1329,27 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h + --- 7.5 mandatory-y + + mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm + to define the minimun set of headers that must be exported in + include/asm. + + The convention is to list one subdir per line and + preferably in alphabetic order. + + --- 7.6 subdir-y + + subdir-y may be used to specify a subdirectory to be exported. + + Example: + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ + + The convention is to list one subdir per line and + preferably in alphabetic order. + === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 69c965304146..374bd123329f 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,6 +1,5 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h - generic-y += setup.h generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y += - - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 1c532b3f18ea..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,61 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..8e6b335664f2 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +mandatory-y += auxvec.h +mandatory-y += bitsperlong.h +mandatory-y += byteorder.h +mandatory-y += errno.h +mandatory-y += fcntl.h +mandatory-y += ioctl.h +mandatory-y += ioctls.h +mandatory-y += ipcbuf.h +mandatory-y += mman.h +mandatory-y += msgbuf.h +mandatory-y += param.h +mandatory-y += poll.h +mandatory-y += posix_types.h +mandatory-y += ptrace.h +mandatory-y += resource.h +mandatory-y += sembuf.h +mandatory-y += setup.h +mandatory-y += shmbuf.h +mandatory-y += sigcontext.h +mandatory-y += siginfo.h +mandatory-y += signal.h +mandatory-y += socket.h +mandatory-y += sockios.h +mandatory-y += stat.h +mandatory-y += statfs.h +mandatory-y += swab.h +mandatory-y += termbits.h +mandatory-y += termios.h +mandatory-y += types.h +mandatory-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +mandatory-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index f330ba4547cf..456cbe8a2aad 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -1,483 +1,16 @@ # UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) +header-n += a.out.h endif -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) +header-n += kvm.h endif - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) +header-n += kvm_para.h endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += timerfd.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index bb68cb1b04ed..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,19 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h -header-y += qedr-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..122945618ae2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,19 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +27,15 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +srcdir := $(srctree)/$(obj) +gendir := $(objtree)/$(gen) +subdirs := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srcdir)/*.h)) +header-files += $(notdir $(wildcard $(srcdir)/*.agh)) +header-files := $(filter-out $(header-n), $(header-files)) +genhdr-files := $(notdir $(wildcard $(gendir)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,25 +43,20 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) - -srcdir := $(srctree)/$(obj) -gendir := $(objtree)/$(gen) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) +ifneq ($(mandatory-y),) +missing := $(filter-out $(all-files),$(mandatory-y)) +ifneq ($(missing),) +$(error Some mandatory headers ($(missing)) are missing in $(obj)) +endif +endif # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -67,8 +70,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v6 7/8] uapi: export all headers under uapi directories 2017-02-10 10:58 ` [PATCH v6 7/8] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-02-13 7:49 ` Christoph Hellwig 2017-02-20 9:32 ` Nicolas Dichtel 0 siblings, 1 reply; 554+ messages in thread From: Christoph Hellwig @ 2017-02-13 7:49 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo > linux/genwqe/..install.cmd > linux/genwqe/.install Third time: NAK on exporting internal kbuild metadata. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v6 7/8] uapi: export all headers under uapi directories 2017-02-13 7:49 ` Christoph Hellwig @ 2017-02-20 9:32 ` Nicolas Dichtel 2017-02-20 10:14 ` Arnd Bergmann 0 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-20 9:32 UTC (permalink / raw) To: Christoph Hellwig Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, tklauser, mpe, mingo Le 13/02/2017 à 08:49, Christoph Hellwig a écrit : >> linux/genwqe/..install.cmd >> linux/genwqe/.install > > Third time: NAK on exporting internal kbuild metadata. > And for the third time: this is not related to this series. Those files are there before my series and the goal of the series has nothing to do with that. Feel free to send a patch. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v6 7/8] uapi: export all headers under uapi directories 2017-02-20 9:32 ` Nicolas Dichtel @ 2017-02-20 10:14 ` Arnd Bergmann 2017-02-20 12:58 ` Nicolas Dichtel 2017-02-24 16:49 ` [PATCH v7 0/8] " Nicolas Dichtel 0 siblings, 2 replies; 554+ messages in thread From: Arnd Bergmann @ 2017-02-20 10:14 UTC (permalink / raw) To: Nicolas Dichtel Cc: Christoph Hellwig, Michal Marek, linux-kbuild, Linux Kernel Mailing List, linux-arch, David Airlie, David Miller, Russell King - ARM Linux, bp, Mason, daniel.vetter, rmk+kernel, msalter, jengelh, tklauser, Michael Ellerman, mingo On Mon, Feb 20, 2017 at 10:32 AM, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > Le 13/02/2017 à 08:49, Christoph Hellwig a écrit : >>> linux/genwqe/..install.cmd >>> linux/genwqe/.install >> >> Third time: NAK on exporting internal kbuild metadata. >> > And for the third time: this is not related to this series. Those files are > there before my series and the goal of the series has nothing to do with that. > > Feel free to send a patch. Your description literally says "After this patch, the following files, which were not exported, are now exported (with make headers_install_all)" for the files that Christoph quoted. It that is not true, then you need to update the patch description to say what your patch actually does. Arnd ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v6 7/8] uapi: export all headers under uapi directories 2017-02-20 10:14 ` Arnd Bergmann @ 2017-02-20 12:58 ` Nicolas Dichtel 2017-02-24 16:49 ` [PATCH v7 0/8] " Nicolas Dichtel 1 sibling, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-20 12:58 UTC (permalink / raw) To: Arnd Bergmann Cc: Christoph Hellwig, Michal Marek, linux-kbuild, Linux Kernel Mailing List, linux-arch, David Airlie, David Miller, Russell King - ARM Linux, bp, Mason, daniel.vetter, rmk+kernel, msalter, jengelh, tklauser, Michael Ellerman, mingo Le 20/02/2017 à 11:14, Arnd Bergmann a écrit : > On Mon, Feb 20, 2017 at 10:32 AM, Nicolas Dichtel > <nicolas.dichtel@6wind.com> wrote: >> Le 13/02/2017 à 08:49, Christoph Hellwig a écrit : >>>> linux/genwqe/..install.cmd >>>> linux/genwqe/.install >>> >>> Third time: NAK on exporting internal kbuild metadata. >>> >> And for the third time: this is not related to this series. Those files are >> there before my series and the goal of the series has nothing to do with that. >> >> Feel free to send a patch. > > Your description literally says "After this patch, the following files, which > were not exported, are now exported (with make headers_install_all)" > for the files that Christoph quoted. It that is not true, then you need to > update the patch description to say what your patch actually does. That is true. But as I explained when the comment was done the first time (and I never got any answer), these files are generated in every exported directory. Because the genwqe directory is now exported, the corresponding '..install.cmd' and '.install' are generated. See http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/scripts/Makefile.headersinst#n32 and http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/scripts/Makefile.headersinst#n130 for more details. In other words, these files are there because some new directories are exported. If those directories were added to the 'header-y' variable, the result would be the same. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v7 0/8] uapi: export all headers under uapi directories 2017-02-20 10:14 ` Arnd Bergmann 2017-02-20 12:58 ` Nicolas Dichtel @ 2017-02-24 16:49 ` Nicolas Dichtel 2017-02-24 16:49 ` [PATCH v7 1/8] h8300: put bitsperlong.h in uapi Nicolas Dichtel ` (7 more replies) 1 sibling, 8 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-24 16:49 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx Here is the v7 of this series. Patches #1 and #2 are just cleanup: some exported headers were still under a non-uapi directory. Patch #3 is a fix to avoid exporting a file that was not under an uapi directory. After these three patches, all exported headers are under an uapi directory: path #4 stops searching files in non uapi directories. The patch #5 was spotted by code review: there is no in-tree user of this functionality. Patch #6 fixes some warnings/errors reported by 0-day tests. Patches #7 and #8 remove the need to list explicitly headers. Now all files under an uapi directory are exported. This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. If I must rebase it against the kbuild tree, just tell me. Michal, is this series going through your tree? v6 -> v7: - rebase on last linus tree - patch #7: remove autogenerated files from the list in the commit log v5 -> v6: - patch #6: remove change of include/uapi/linux/media.h - patch #7: fix hdr export when 'make O=' is used (look for genhdr files in the right directory) - patch #8: fix 'make headers_check' v4 -> v5: - patch #3: get back to v3 (don't export msr-index.h) - patch #6: new in this version - patch #7: fix compilation by introducing header-n v3 -> v4: - first patch has been included - patch #4: get back to v2 and remove arch/x86/include/asm/msr-index.h v2 -> v3: - patch #1: remove arch/arm/include/asm/types.h - patch #2: remove arch/h8300/include/asm/bitsperlong.h - patch #3: remove arch/nios2/include/uapi/asm/setup.h - patch #4: don't export msr-index.h - patch #5: fix a typo: s/unput-files3-name/input-files3-name - patch #6: no change - patch #7: fix include/uapi/asm-generic/Kbuild.asm by introducing mandatory-y - add patch #8 v1 -> v2: - add patch #1 to #6 - patch #7: remove use of header-y Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v7 1/8] h8300: put bitsperlong.h in uapi 2017-02-24 16:49 ` [PATCH v7 0/8] " Nicolas Dichtel @ 2017-02-24 16:49 ` Nicolas Dichtel 2017-02-24 16:49 ` [PATCH v7 2/8] nios2: put setup.h " Nicolas Dichtel ` (6 subsequent siblings) 7 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-24 16:49 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, Nicolas Dichtel This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 14 -------------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h deleted file mode 100644 index e140e46729ac..000000000000 --- a/arch/h8300/include/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __ASM_H8300_BITS_PER_LONG -#define __ASM_H8300_BITS_PER_LONG - -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif - -#endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v7 2/8] nios2: put setup.h in uapi 2017-02-24 16:49 ` [PATCH v7 0/8] " Nicolas Dichtel 2017-02-24 16:49 ` [PATCH v7 1/8] h8300: put bitsperlong.h in uapi Nicolas Dichtel @ 2017-02-24 16:49 ` Nicolas Dichtel 2017-02-24 16:49 ` [PATCH v7 3/8] x86: stop exporting msr-index.h to userland Nicolas Dichtel ` (5 subsequent siblings) 7 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-24 16:49 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, Nicolas Dichtel This header file is exported, but from a userland pov, it's just a wrapper to asm-generic/setup.h. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: Tobias Klauser <tklauser@distanz.ch> --- arch/nios2/include/uapi/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..69c965304146 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -2,4 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h +generic-y += setup.h generic-y += ucontext.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v7 3/8] x86: stop exporting msr-index.h to userland 2017-02-24 16:49 ` [PATCH v7 0/8] " Nicolas Dichtel 2017-02-24 16:49 ` [PATCH v7 1/8] h8300: put bitsperlong.h in uapi Nicolas Dichtel 2017-02-24 16:49 ` [PATCH v7 2/8] nios2: put setup.h " Nicolas Dichtel @ 2017-02-24 16:49 ` Nicolas Dichtel 2017-02-24 16:49 ` [PATCH v7 4/8] Makefile.headersinst: cleanup input files Nicolas Dichtel ` (4 subsequent siblings) 7 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-24 16:49 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, Nicolas Dichtel Even if this file was not in an uapi directory, it was exported because it was listed in the Kbuild file. Fixes: b72e7464e4cf ("x86/uapi: Do not export <asm/msr-index.h> as part of the user API headers") Suggested-by: Borislav Petkov <bp@alien8.de> CC: Ingo Molnar <mingo@kernel.org> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Ingo Molnar <mingo@kernel.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> --- arch/x86/include/uapi/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..1c532b3f18ea 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -27,7 +27,6 @@ header-y += ldt.h header-y += mce.h header-y += mman.h header-y += msgbuf.h -header-y += msr-index.h header-y += msr.h header-y += mtrr.h header-y += param.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v7 4/8] Makefile.headersinst: cleanup input files 2017-02-24 16:49 ` [PATCH v7 0/8] " Nicolas Dichtel ` (2 preceding siblings ...) 2017-02-24 16:49 ` [PATCH v7 3/8] x86: stop exporting msr-index.h to userland Nicolas Dichtel @ 2017-02-24 16:49 ` Nicolas Dichtel 2017-02-24 16:49 ` [PATCH v7 5/8] Makefile.headersinst: remove destination-y option Nicolas Dichtel ` (3 subsequent siblings) 7 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-24 16:49 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, Nicolas Dichtel After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that input-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v7 5/8] Makefile.headersinst: remove destination-y option 2017-02-24 16:49 ` [PATCH v7 0/8] " Nicolas Dichtel ` (3 preceding siblings ...) 2017-02-24 16:49 ` [PATCH v7 4/8] Makefile.headersinst: cleanup input files Nicolas Dichtel @ 2017-02-24 16:49 ` Nicolas Dichtel 2017-02-24 16:49 ` [PATCH v7 6/8] uapi: includes linux/types.h before exporting files Nicolas Dichtel ` (2 subsequent siblings) 7 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-24 16:49 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, Nicolas Dichtel This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Paul Bolle <pebolle@tiscali.nl> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v7 6/8] uapi: includes linux/types.h before exporting files 2017-02-24 16:49 ` [PATCH v7 0/8] " Nicolas Dichtel ` (4 preceding siblings ...) 2017-02-24 16:49 ` [PATCH v7 5/8] Makefile.headersinst: remove destination-y option Nicolas Dichtel @ 2017-02-24 16:49 ` Nicolas Dichtel 2017-02-24 16:49 ` [PATCH v7 7/8] uapi: export all headers under uapi directories Nicolas Dichtel 2017-02-24 16:49 ` [PATCH v7 8/8] " Nicolas Dichtel 7 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-24 16:49 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, Nicolas Dichtel Some files will be exported after the next patch. 0-day tests report the following warning/error: ./usr/include/linux/bcache.h:8: include of <linux/types.h> is preferred over <asm/types.h> ./usr/include/linux/bcache.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/qrtr.h:8: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/cryptouser.h:39: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/pr.h:14: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/btrfs_tree.h:337: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/rdma/bnxt_re-abi.h:45: found __[us]{8,16,32,64} type without #include <linux/types.h> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/uapi/linux/bcache.h | 2 +- include/uapi/linux/btrfs_tree.h | 2 ++ include/uapi/linux/cryptouser.h | 2 ++ include/uapi/linux/pr.h | 2 ++ include/uapi/linux/qrtr.h | 1 + include/uapi/rdma/bnxt_re-abi.h | 2 ++ 6 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h index 22b6ad31c706..e3bb0635e94a 100644 --- a/include/uapi/linux/bcache.h +++ b/include/uapi/linux/bcache.h @@ -5,7 +5,7 @@ * Bcache on disk data structures */ -#include <asm/types.h> +#include <linux/types.h> #define BITMASK(name, type, field, offset, size) \ static inline __u64 name(const type *k) \ diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h index d5ad15a106a7..6a261cb52d95 100644 --- a/include/uapi/linux/btrfs_tree.h +++ b/include/uapi/linux/btrfs_tree.h @@ -1,6 +1,8 @@ #ifndef _BTRFS_CTREE_H_ #define _BTRFS_CTREE_H_ +#include <linux/types.h> + /* * This header contains the structure definitions and constants used * by file system objects that can be retrieved using diff --git a/include/uapi/linux/cryptouser.h b/include/uapi/linux/cryptouser.h index 11d21fce14d6..c6a09c5261e7 100644 --- a/include/uapi/linux/cryptouser.h +++ b/include/uapi/linux/cryptouser.h @@ -18,6 +18,8 @@ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <linux/types.h> + /* Netlink configuration messages. */ enum { CRYPTO_MSG_BASE = 0x10, diff --git a/include/uapi/linux/pr.h b/include/uapi/linux/pr.h index 57d7c0f916b6..645ef3cf3dd0 100644 --- a/include/uapi/linux/pr.h +++ b/include/uapi/linux/pr.h @@ -1,6 +1,8 @@ #ifndef _UAPI_PR_H #define _UAPI_PR_H +#include <linux/types.h> + enum pr_type { PR_WRITE_EXCLUSIVE = 1, PR_EXCLUSIVE_ACCESS = 2, diff --git a/include/uapi/linux/qrtr.h b/include/uapi/linux/qrtr.h index 66c0748d26e2..b14ee91ec387 100644 --- a/include/uapi/linux/qrtr.h +++ b/include/uapi/linux/qrtr.h @@ -1,6 +1,7 @@ #ifndef _LINUX_QRTR_H #define _LINUX_QRTR_H +#include <linux/types.h> #include <linux/socket.h> struct sockaddr_qrtr { diff --git a/include/uapi/rdma/bnxt_re-abi.h b/include/uapi/rdma/bnxt_re-abi.h index e2c8a3f0ccec..74018bd18d72 100644 --- a/include/uapi/rdma/bnxt_re-abi.h +++ b/include/uapi/rdma/bnxt_re-abi.h @@ -39,6 +39,8 @@ #ifndef __BNXT_RE_UVERBS_ABI_H__ #define __BNXT_RE_UVERBS_ABI_H__ +#include <linux/types.h> + #define BNXT_RE_ABI_VERSION 1 struct bnxt_re_uctx_resp { -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v7 7/8] uapi: export all headers under uapi directories 2017-02-24 16:49 ` [PATCH v7 0/8] " Nicolas Dichtel ` (5 preceding siblings ...) 2017-02-24 16:49 ` [PATCH v7 6/8] uapi: includes linux/types.h before exporting files Nicolas Dichtel @ 2017-02-24 16:49 ` Nicolas Dichtel 2017-02-27 16:01 ` Nicolas Dichtel 2017-02-24 16:49 ` [PATCH v7 8/8] " Nicolas Dichtel 7 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-24 16:49 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, Nicolas Dichtel Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-arc/kvm_para.h asm-arc/ucontext.h asm-avr32/kvm_para.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-c6x/shmparam.h asm-c6x/ucontext.h asm-cris/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-hexagon/shmparam.h asm-m32r/kvm_para.h asm-m68k/kvm_para.h asm-m68k/shmparam.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-mips/hwcap.h asm-mips/reg.h asm-mips/ucontext.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-openrisc/shmparam.h asm-parisc/kvm_para.h asm-powerpc/perf_regs.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-tile/shmparam.h asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-x86/hwcap2.h asm-xtensa/kvm_para.h drm/armada_drm.h drm/etnaviv_drm.h drm/vgem_drm.h linux/auto_dev-ioctl.h linux/bcache.h linux/btrfs_tree.h linux/cifs linux/cifs/cifs_mount.h linux/coresight-stm.h linux/cryptouser.h linux/genwqe linux/genwqe/genwqe_card.h linux/hash_info.h linux/kcm.h linux/kcov.h linux/kfd_ioctl.h linux/lightnvm.h linux/module.h linux/nilfs2_api.h linux/nilfs2_ondisk.h linux/nsfs.h linux/pr.h linux/qrtr.h linux/rpmsg.h linux/sed-opal.h linux/smc.h linux/smc_diag.h linux/stm.h linux/userio.h linux/wil6210_uapi.h rdma/bnxt_re-abi.h Note that I have removed from this list the files which are generated in every exported directories (like .install or .install.cmd). Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. For the record, note that exported files for asm directories are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/<arch>/include/uapi/asm/Kbuild; - arch/<arch>/include/asm/Kbuild. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Mark Salter <msalter@redhat.com> Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) --- Documentation/kbuild/makefiles.txt | 66 ++-- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 - arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 3 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 3 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 58 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 -- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 23 -- include/uapi/linux/Kbuild | 493 +--------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 - include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 16 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 20 -- include/uapi/rdma/hfi/Kbuild | 3 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 51 +-- 81 files changed, 113 insertions(+), 1755 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..91ffb391ed54 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,10 +44,12 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 header-n --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y + --- 7.5 mandatory-y + --- 7.6 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1235,7 +1237,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1264,30 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. -See subsequent chapter for the syntax of the Kbuild file. - - --- 7.1 header-y - - header-y specifies header files to be exported. - - Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. - The convention is to list one file per line and - preferably in alphabetic order. +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. +See subsequent chapter for the syntax of the Kbuild file. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. + --- 7.1 header-n - Subdirectories are visited before their parent directories. + header-n is essentially used by include/uapi/linux/Kbuild to avoid + exporting specific headers (e.g. kvm.h) on architectures that do not + support it. It should be avoided as much as possible. --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y @@ -1334,6 +1329,27 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h + --- 7.5 mandatory-y + + mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm + to define the minimun set of headers that must be exported in + include/asm. + + The convention is to list one subdir per line and + preferably in alphabetic order. + + --- 7.6 subdir-y + + subdir-y may be used to specify a subdirectory to be exported. + + Example: + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ + + The convention is to list one subdir per line and + preferably in alphabetic order. + === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index a43a7c90e4af..70711fd7842c 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 69c965304146..374bd123329f 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,6 +1,5 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h - generic-y += setup.h generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index ef8d1ccc3e45..9cca71975b69 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index db3e28ca3ae2..59f76b45477d 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += - generic-y += barrier.h generic-y += clkdev.h generic-y += current.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index aa48b6eaff2d..61157a7e8532 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 1c532b3f18ea..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,61 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..8e6b335664f2 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +mandatory-y += auxvec.h +mandatory-y += bitsperlong.h +mandatory-y += byteorder.h +mandatory-y += errno.h +mandatory-y += fcntl.h +mandatory-y += ioctl.h +mandatory-y += ioctls.h +mandatory-y += ipcbuf.h +mandatory-y += mman.h +mandatory-y += msgbuf.h +mandatory-y += param.h +mandatory-y += poll.h +mandatory-y += posix_types.h +mandatory-y += ptrace.h +mandatory-y += resource.h +mandatory-y += sembuf.h +mandatory-y += setup.h +mandatory-y += shmbuf.h +mandatory-y += sigcontext.h +mandatory-y += siginfo.h +mandatory-y += signal.h +mandatory-y += socket.h +mandatory-y += sockios.h +mandatory-y += stat.h +mandatory-y += statfs.h +mandatory-y += swab.h +mandatory-y += termbits.h +mandatory-y += termios.h +mandatory-y += types.h +mandatory-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +mandatory-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index c97addd08f8c..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,23 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += omap_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index 1c80efb67d10..456cbe8a2aad 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -1,491 +1,16 @@ # UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) +header-n += a.out.h endif -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += batman_adv.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dma-buf.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += ife.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) +header-n += kvm.h endif - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) +header-n += kvm_para.h endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += psample.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += seg6_genl.h -header-y += seg6.h -header-y += seg6_hmac.h -header-y += seg6_iptunnel.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += timerfd.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index ba62ddf0e58a..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_sample.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 1e0af1ff75c3..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,20 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += rdma_user_ioctl.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h -header-y += qedr-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index b65b0b3a5f63..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h -header-y += hfi1_ioctl.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..122945618ae2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,19 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +27,15 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +srcdir := $(srctree)/$(obj) +gendir := $(objtree)/$(gen) +subdirs := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srcdir)/*.h)) +header-files += $(notdir $(wildcard $(srcdir)/*.agh)) +header-files := $(filter-out $(header-n), $(header-files)) +genhdr-files := $(notdir $(wildcard $(gendir)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,25 +43,20 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) - -srcdir := $(srctree)/$(obj) -gendir := $(objtree)/$(gen) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) +ifneq ($(mandatory-y),) +missing := $(filter-out $(all-files),$(mandatory-y)) +ifneq ($(missing),) +$(error Some mandatory headers ($(missing)) are missing in $(obj)) +endif +endif # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -67,8 +70,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v7 7/8] uapi: export all headers under uapi directories 2017-02-24 16:49 ` [PATCH v7 7/8] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-02-27 16:01 ` Nicolas Dichtel 2017-02-28 2:48 ` Dmitry V. Levin 0 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-27 16:01 UTC (permalink / raw) To: arnd, mmarek, linux-kbuild Cc: linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx Le 24/02/2017 à 17:49, Nicolas Dichtel a écrit : > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-arc/kvm_para.h > asm-arc/ucontext.h > asm-avr32/kvm_para.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-c6x/shmparam.h > asm-c6x/ucontext.h > asm-cris/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-hexagon/shmparam.h > asm-m32r/kvm_para.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > asm-mips/ucontext.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-openrisc/shmparam.h > asm-parisc/kvm_para.h > asm-powerpc/perf_regs.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-tile/shmparam.h > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-x86/hwcap2.h > asm-xtensa/kvm_para.h > drm/armada_drm.h > drm/etnaviv_drm.h > drm/vgem_drm.h > linux/auto_dev-ioctl.h > linux/bcache.h > linux/btrfs_tree.h > linux/cifs > linux/cifs/cifs_mount.h > linux/coresight-stm.h > linux/cryptouser.h > linux/genwqe > linux/genwqe/genwqe_card.h > linux/hash_info.h > linux/kcm.h > linux/kcov.h > linux/kfd_ioctl.h > linux/lightnvm.h > linux/module.h > linux/nilfs2_api.h > linux/nilfs2_ondisk.h > linux/nsfs.h > linux/pr.h > linux/qrtr.h > linux/rpmsg.h > linux/sed-opal.h > linux/smc.h > linux/smc_diag.h > linux/stm.h > linux/userio.h > linux/wil6210_uapi.h > rdma/bnxt_re-abi.h > > Note that I have removed from this list the files which are generated in every > exported directories (like .install or .install.cmd). > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > subdirs with a pure makefile command. > > For the record, note that exported files for asm directories are a mix of > files listed by: > - include/uapi/asm-generic/Kbuild.asm; > - arch/<arch>/include/uapi/asm/Kbuild; > - arch/<arch>/include/asm/Kbuild. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > Acked-by: Russell King <rmk+kernel@armlinux.org.uk> > Acked-by: Mark Salter <msalter@redhat.com> > Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) Is there any chance to get this series in before the rc1? Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v7 7/8] uapi: export all headers under uapi directories 2017-02-27 16:01 ` Nicolas Dichtel @ 2017-02-28 2:48 ` Dmitry V. Levin 2017-02-28 15:47 ` Nicolas Dichtel 2017-02-28 20:47 ` [PATCH v8 00/11] " Nicolas Dichtel 0 siblings, 2 replies; 554+ messages in thread From: Dmitry V. Levin @ 2017-02-28 2:48 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx [-- Attachment #1: Type: text/plain, Size: 3812 bytes --] On Mon, Feb 27, 2017 at 05:01:55PM +0100, Nicolas Dichtel wrote: > Le 24/02/2017 à 17:49, Nicolas Dichtel a écrit : > > Regularly, when a new header is created in include/uapi/, the developer > > forgets to add it in the corresponding Kbuild file. This error is usually > > detected after the release is out. > > > > In fact, all headers under uapi directories should be exported, thus it's > > useless to have an exhaustive list. > > > > After this patch, the following files, which were not exported, are now > > exported (with make headers_install_all): > > asm-arc/kvm_para.h > > asm-arc/ucontext.h > > asm-avr32/kvm_para.h > > asm-blackfin/shmparam.h > > asm-blackfin/ucontext.h > > asm-c6x/shmparam.h > > asm-c6x/ucontext.h > > asm-cris/kvm_para.h > > asm-h8300/shmparam.h > > asm-h8300/ucontext.h > > asm-hexagon/shmparam.h > > asm-m32r/kvm_para.h > > asm-m68k/kvm_para.h > > asm-m68k/shmparam.h > > asm-metag/kvm_para.h > > asm-metag/shmparam.h > > asm-metag/ucontext.h > > asm-mips/hwcap.h > > asm-mips/reg.h > > asm-mips/ucontext.h > > asm-nios2/kvm_para.h > > asm-nios2/ucontext.h > > asm-openrisc/shmparam.h > > asm-parisc/kvm_para.h > > asm-powerpc/perf_regs.h > > asm-sh/kvm_para.h > > asm-sh/ucontext.h > > asm-tile/shmparam.h > > asm-unicore32/shmparam.h > > asm-unicore32/ucontext.h > > asm-x86/hwcap2.h > > asm-xtensa/kvm_para.h > > drm/armada_drm.h > > drm/etnaviv_drm.h > > drm/vgem_drm.h > > linux/auto_dev-ioctl.h > > linux/bcache.h > > linux/btrfs_tree.h > > linux/cifs > > linux/cifs/cifs_mount.h > > linux/coresight-stm.h > > linux/cryptouser.h > > linux/genwqe > > linux/genwqe/genwqe_card.h > > linux/hash_info.h > > linux/kcm.h > > linux/kcov.h > > linux/kfd_ioctl.h > > linux/lightnvm.h > > linux/module.h > > linux/nilfs2_api.h > > linux/nilfs2_ondisk.h > > linux/nsfs.h > > linux/pr.h > > linux/qrtr.h > > linux/rpmsg.h > > linux/sed-opal.h > > linux/smc.h > > linux/smc_diag.h > > linux/stm.h > > linux/userio.h > > linux/wil6210_uapi.h > > rdma/bnxt_re-abi.h > > > > Note that I have removed from this list the files which are generated in every > > exported directories (like .install or .install.cmd). > > > > Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all > > subdirs with a pure makefile command. > > > > For the record, note that exported files for asm directories are a mix of > > files listed by: > > - include/uapi/asm-generic/Kbuild.asm; > > - arch/<arch>/include/uapi/asm/Kbuild; > > - arch/<arch>/include/asm/Kbuild. > > > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > > Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > Acked-by: Russell King <rmk+kernel@armlinux.org.uk> > > Acked-by: Mark Salter <msalter@redhat.com> > > Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) > Is there any chance to get this series in before the rc1? Note that the following newly exported headers have userspace compilation errors: /usr/include/drm/armada_drm.h:26:2: error: unknown type name 'uint32_t' uint32_t handle; /usr/include/linux/btrfs_tree.h:390:12: error: 'BTRFS_UUID_SIZE' undeclared here (not in a function) __u8 uuid[BTRFS_UUID_SIZE]; /usr/include/linux/cryptouser.h:58:16: error: 'CRYPTO_MAX_ALG_NAME' undeclared here (not in a function) char cru_name[CRYPTO_MAX_ALG_NAME]; /usr/include/linux/kfd_ioctl.h:33:2: error: unknown type name 'uint32_t' uint32_t major_version; /* from KFD */ /usr/include/linux/smc_diag.h:6:27: fatal error: rdma/ib_verbs.h: No such file or directory #include <rdma/ib_verbs.h> /usr/include/linux/wil6210_uapi.h:73:2: error: unknown type name 'uint32_t' uint32_t op; /* enum wil_memio_op */ I think they should be fixed first. -- ldv [-- Attachment #2: Type: application/pgp-signature, Size: 801 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v7 7/8] uapi: export all headers under uapi directories 2017-02-28 2:48 ` Dmitry V. Levin @ 2017-02-28 15:47 ` Nicolas Dichtel 2017-02-28 20:47 ` [PATCH v8 00/11] " Nicolas Dichtel 1 sibling, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-28 15:47 UTC (permalink / raw) To: Dmitry V. Levin Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx Le 28/02/2017 à 03:48, Dmitry V. Levin a écrit : > On Mon, Feb 27, 2017 at 05:01:55PM +0100, Nicolas Dichtel wrote: [snip] >> Is there any chance to get this series in before the rc1? > > Note that the following newly exported headers have userspace compilation > errors: > > /usr/include/drm/armada_drm.h:26:2: error: unknown type name 'uint32_t' > uint32_t handle; > > /usr/include/linux/btrfs_tree.h:390:12: error: 'BTRFS_UUID_SIZE' undeclared here (not in a function) > __u8 uuid[BTRFS_UUID_SIZE]; > > /usr/include/linux/cryptouser.h:58:16: error: 'CRYPTO_MAX_ALG_NAME' undeclared here (not in a function) > char cru_name[CRYPTO_MAX_ALG_NAME]; > > /usr/include/linux/kfd_ioctl.h:33:2: error: unknown type name 'uint32_t' > uint32_t major_version; /* from KFD */ > > /usr/include/linux/smc_diag.h:6:27: fatal error: rdma/ib_verbs.h: No such file or directory > #include <rdma/ib_verbs.h> > > /usr/include/linux/wil6210_uapi.h:73:2: error: unknown type name 'uint32_t' > uint32_t op; /* enum wil_memio_op */ > > I think they should be fixed first. Sure. Thanks for pointing this out. I will send a v8. I'm still wondering if Michal will take this series or if it will go through another tree. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v8 00/11] uapi: export all headers under uapi directories 2017-02-28 2:48 ` Dmitry V. Levin 2017-02-28 15:47 ` Nicolas Dichtel @ 2017-02-28 20:47 ` Nicolas Dichtel 2017-02-28 20:47 ` [PATCH v8 01/11] h8300: put bitsperlong.h in uapi Nicolas Dichtel ` (10 more replies) 1 sibling, 11 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-28 20:47 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma Patches #1 and #2 are just cleanup: some exported headers were still under a non-uapi directory. Patch #3 is a fix to avoid exporting a file that was not under an uapi directory. After these three patches, all exported headers are under an uapi directory: path #4 stops searching files in non uapi directories. The patch #5 was spotted by code review: there is no in-tree user of this functionality. Patch #6 fixes some warnings/errors reported by 0-day tests. Patch #7 to #9 fix some errors when the corresponding files are included by userland. Patches #10 and #11 remove the need to list explicitly headers. Now all files under an uapi directory are exported. This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. If I must rebase it against the kbuild tree, just tell me. Michal, is this series going through your tree? v7 -> v8: - rebase on top of linus tree - add patch #7, #8 and #9 v6 -> v7: - rebase on top of linus tree - patch #7: remove autogenerated files from the list in the commit log v5 -> v6: - patch #6: remove change of include/uapi/linux/media.h - patch #7: fix hdr export when 'make O=' is used (look for genhdr files in the right directory) - patch #8: fix 'make headers_check' v4 -> v5: - patch #3: get back to v3 (don't export msr-index.h) - patch #6: new in this version - patch #7: fix compilation by introducing header-n v3 -> v4: - first patch has been included - patch #4: get back to v2 and remove arch/x86/include/asm/msr-index.h v2 -> v3: - patch #1: remove arch/arm/include/asm/types.h - patch #2: remove arch/h8300/include/asm/bitsperlong.h - patch #3: remove arch/nios2/include/uapi/asm/setup.h - patch #4: don't export msr-index.h - patch #5: fix a typo: s/unput-files3-name/input-files3-name - patch #6: no change - patch #7: fix include/uapi/asm-generic/Kbuild.asm by introducing mandatory-y - add patch #8 v1 -> v2: - add patch #1 to #6 - patch #7: remove use of header-y Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v8 01/11] h8300: put bitsperlong.h in uapi 2017-02-28 20:47 ` [PATCH v8 00/11] " Nicolas Dichtel @ 2017-02-28 20:47 ` Nicolas Dichtel 2017-02-28 20:47 ` [PATCH v8 02/11] nios2: put setup.h " Nicolas Dichtel ` (9 subsequent siblings) 10 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-28 20:47 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 14 -------------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h deleted file mode 100644 index e140e46729ac..000000000000 --- a/arch/h8300/include/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __ASM_H8300_BITS_PER_LONG -#define __ASM_H8300_BITS_PER_LONG - -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif - -#endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v8 02/11] nios2: put setup.h in uapi 2017-02-28 20:47 ` [PATCH v8 00/11] " Nicolas Dichtel 2017-02-28 20:47 ` [PATCH v8 01/11] h8300: put bitsperlong.h in uapi Nicolas Dichtel @ 2017-02-28 20:47 ` Nicolas Dichtel 2017-02-28 20:47 ` [PATCH v8 03/11] x86: stop exporting msr-index.h to userland Nicolas Dichtel ` (8 subsequent siblings) 10 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-28 20:47 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This header file is exported, but from a userland pov, it's just a wrapper to asm-generic/setup.h. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: Tobias Klauser <tklauser@distanz.ch> --- arch/nios2/include/uapi/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..69c965304146 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -2,4 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h +generic-y += setup.h generic-y += ucontext.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v8 03/11] x86: stop exporting msr-index.h to userland 2017-02-28 20:47 ` [PATCH v8 00/11] " Nicolas Dichtel 2017-02-28 20:47 ` [PATCH v8 01/11] h8300: put bitsperlong.h in uapi Nicolas Dichtel 2017-02-28 20:47 ` [PATCH v8 02/11] nios2: put setup.h " Nicolas Dichtel @ 2017-02-28 20:47 ` Nicolas Dichtel 2017-02-28 20:47 ` [PATCH v8 04/11] Makefile.headersinst: cleanup input files Nicolas Dichtel ` (7 subsequent siblings) 10 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-28 20:47 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma Even if this file was not in an uapi directory, it was exported because it was listed in the Kbuild file. Fixes: b72e7464e4cf ("x86/uapi: Do not export <asm/msr-index.h> as part of the user API headers") Suggested-by: Borislav Petkov <bp@alien8.de> CC: Ingo Molnar <mingo@kernel.org> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Ingo Molnar <mingo@kernel.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> --- arch/x86/include/uapi/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..1c532b3f18ea 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -27,7 +27,6 @@ header-y += ldt.h header-y += mce.h header-y += mman.h header-y += msgbuf.h -header-y += msr-index.h header-y += msr.h header-y += mtrr.h header-y += param.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v8 04/11] Makefile.headersinst: cleanup input files 2017-02-28 20:47 ` [PATCH v8 00/11] " Nicolas Dichtel ` (2 preceding siblings ...) 2017-02-28 20:47 ` [PATCH v8 03/11] x86: stop exporting msr-index.h to userland Nicolas Dichtel @ 2017-02-28 20:47 ` Nicolas Dichtel 2017-02-28 20:47 ` [PATCH v8 05/11] Makefile.headersinst: remove destination-y option Nicolas Dichtel ` (6 subsequent siblings) 10 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-28 20:47 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that input-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v8 05/11] Makefile.headersinst: remove destination-y option 2017-02-28 20:47 ` [PATCH v8 00/11] " Nicolas Dichtel ` (3 preceding siblings ...) 2017-02-28 20:47 ` [PATCH v8 04/11] Makefile.headersinst: cleanup input files Nicolas Dichtel @ 2017-02-28 20:47 ` Nicolas Dichtel 2017-02-28 20:47 ` [PATCH v8 06/11] uapi: includes linux/types.h before exporting files Nicolas Dichtel ` (5 subsequent siblings) 10 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-28 20:47 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Paul Bolle <pebolle@tiscali.nl> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v8 06/11] uapi: includes linux/types.h before exporting files 2017-02-28 20:47 ` [PATCH v8 00/11] " Nicolas Dichtel ` (4 preceding siblings ...) 2017-02-28 20:47 ` [PATCH v8 05/11] Makefile.headersinst: remove destination-y option Nicolas Dichtel @ 2017-02-28 20:47 ` Nicolas Dichtel 2017-02-28 20:47 ` [PATCH v8 07/11] btrfs_tree.h: fix include from userland Nicolas Dichtel ` (4 subsequent siblings) 10 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-28 20:47 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma Some files will be exported after the next patch. 0-day tests report the following warning/error: ./usr/include/linux/bcache.h:8: include of <linux/types.h> is preferred over <asm/types.h> ./usr/include/linux/bcache.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/qrtr.h:8: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/cryptouser.h:39: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/pr.h:14: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/btrfs_tree.h:337: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/rdma/bnxt_re-abi.h:45: found __[us]{8,16,32,64} type without #include <linux/types.h> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/uapi/linux/bcache.h | 2 +- include/uapi/linux/btrfs_tree.h | 2 ++ include/uapi/linux/cryptouser.h | 2 ++ include/uapi/linux/pr.h | 2 ++ include/uapi/linux/qrtr.h | 1 + include/uapi/rdma/bnxt_re-abi.h | 2 ++ 6 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h index 22b6ad31c706..e3bb0635e94a 100644 --- a/include/uapi/linux/bcache.h +++ b/include/uapi/linux/bcache.h @@ -5,7 +5,7 @@ * Bcache on disk data structures */ -#include <asm/types.h> +#include <linux/types.h> #define BITMASK(name, type, field, offset, size) \ static inline __u64 name(const type *k) \ diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h index d5ad15a106a7..6a261cb52d95 100644 --- a/include/uapi/linux/btrfs_tree.h +++ b/include/uapi/linux/btrfs_tree.h @@ -1,6 +1,8 @@ #ifndef _BTRFS_CTREE_H_ #define _BTRFS_CTREE_H_ +#include <linux/types.h> + /* * This header contains the structure definitions and constants used * by file system objects that can be retrieved using diff --git a/include/uapi/linux/cryptouser.h b/include/uapi/linux/cryptouser.h index 11d21fce14d6..c6a09c5261e7 100644 --- a/include/uapi/linux/cryptouser.h +++ b/include/uapi/linux/cryptouser.h @@ -18,6 +18,8 @@ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <linux/types.h> + /* Netlink configuration messages. */ enum { CRYPTO_MSG_BASE = 0x10, diff --git a/include/uapi/linux/pr.h b/include/uapi/linux/pr.h index 57d7c0f916b6..645ef3cf3dd0 100644 --- a/include/uapi/linux/pr.h +++ b/include/uapi/linux/pr.h @@ -1,6 +1,8 @@ #ifndef _UAPI_PR_H #define _UAPI_PR_H +#include <linux/types.h> + enum pr_type { PR_WRITE_EXCLUSIVE = 1, PR_EXCLUSIVE_ACCESS = 2, diff --git a/include/uapi/linux/qrtr.h b/include/uapi/linux/qrtr.h index 66c0748d26e2..b14ee91ec387 100644 --- a/include/uapi/linux/qrtr.h +++ b/include/uapi/linux/qrtr.h @@ -1,6 +1,7 @@ #ifndef _LINUX_QRTR_H #define _LINUX_QRTR_H +#include <linux/types.h> #include <linux/socket.h> struct sockaddr_qrtr { diff --git a/include/uapi/rdma/bnxt_re-abi.h b/include/uapi/rdma/bnxt_re-abi.h index e2c8a3f0ccec..74018bd18d72 100644 --- a/include/uapi/rdma/bnxt_re-abi.h +++ b/include/uapi/rdma/bnxt_re-abi.h @@ -39,6 +39,8 @@ #ifndef __BNXT_RE_UVERBS_ABI_H__ #define __BNXT_RE_UVERBS_ABI_H__ +#include <linux/types.h> + #define BNXT_RE_ABI_VERSION 1 struct bnxt_re_uctx_resp { -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v8 07/11] btrfs_tree.h: fix include from userland 2017-02-28 20:47 ` [PATCH v8 00/11] " Nicolas Dichtel ` (5 preceding siblings ...) 2017-02-28 20:47 ` [PATCH v8 06/11] uapi: includes linux/types.h before exporting files Nicolas Dichtel @ 2017-02-28 20:47 ` Nicolas Dichtel 2017-02-28 20:47 ` [PATCH v8 08/11] cryptouser.h: " Nicolas Dichtel ` (3 subsequent siblings) 10 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-28 20:47 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This patch prepares the uapi export by fixing the following errors: .../linux/btrfs_tree.h:283:2: error: #error "UUID items require BTRFS_UUID_SIZE == 16!" #error "UUID items require BTRFS_UUID_SIZE == 16!" .../linux/btrfs_tree.h:390:12: error: ‘BTRFS_UUID_SIZE’ undeclared here (not in a function) __u8 uuid[BTRFS_UUID_SIZE]; ^ .../linux/btrfs_tree.h:796:16: error: ‘BTRFS_DEV_STAT_VALUES_MAX’ undeclared here (not in a function) __le64 values[BTRFS_DEV_STAT_VALUES_MAX]; Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/uapi/linux/btrfs_tree.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h index 6a261cb52d95..6a754ada59af 100644 --- a/include/uapi/linux/btrfs_tree.h +++ b/include/uapi/linux/btrfs_tree.h @@ -2,6 +2,7 @@ #define _BTRFS_CTREE_H_ #include <linux/types.h> +#include <linux/btrfs.h> /* * This header contains the structure definitions and constants used -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v8 08/11] cryptouser.h: fix include from userland 2017-02-28 20:47 ` [PATCH v8 00/11] " Nicolas Dichtel ` (6 preceding siblings ...) 2017-02-28 20:47 ` [PATCH v8 07/11] btrfs_tree.h: fix include from userland Nicolas Dichtel @ 2017-02-28 20:47 ` Nicolas Dichtel [not found] ` <1488314857-28327-9-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> 2017-02-28 20:47 ` [PATCH v8 09/11] smc_diag.h: fix include from userland Nicolas Dichtel ` (2 subsequent siblings) 10 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-28 20:47 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This patch prepares the uapi export by fixing the following error: .../linux/cryptouser.h:58:16: error: ‘CRYPTO_MAX_ALG_NAME’ undeclared here (not in a function) char cru_name[CRYPTO_MAX_ALG_NAME]; Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/linux/crypto.h | 2 +- include/uapi/linux/cryptouser.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/linux/crypto.h b/include/linux/crypto.h index c0b0cf3d2d2f..4cf29a35bb4b 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -24,6 +24,7 @@ #include <linux/slab.h> #include <linux/string.h> #include <linux/uaccess.h> +#include <uapi/linux/cryptouser.h> /* * Autoloaded crypto modules should only use a prefixed name to avoid allowing @@ -123,7 +124,6 @@ /* * Miscellaneous stuff. */ -#define CRYPTO_MAX_ALG_NAME 64 /* * The macro CRYPTO_MINALIGN_ATTR (along with the void * type in the actual diff --git a/include/uapi/linux/cryptouser.h b/include/uapi/linux/cryptouser.h index c6a09c5261e7..05fcf1393b4d 100644 --- a/include/uapi/linux/cryptouser.h +++ b/include/uapi/linux/cryptouser.h @@ -18,6 +18,9 @@ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef _UAPI_CRYPTOUSER_H +#define _UAPI_CRYPTOUSER_H + #include <linux/types.h> /* Netlink configuration messages. */ @@ -54,6 +57,8 @@ enum crypto_attr_type_t { #define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1) }; +#define CRYPTO_MAX_ALG_NAME 64 + struct crypto_user_alg { char cru_name[CRYPTO_MAX_ALG_NAME]; char cru_driver_name[CRYPTO_MAX_ALG_NAME]; @@ -121,3 +126,5 @@ struct crypto_report_acomp { #define CRYPTO_REPORT_MAXSIZE (sizeof(struct crypto_user_alg) + \ sizeof(struct crypto_report_blkcipher)) + +#endif /* _UAPI_CRYPTOUSER_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
[parent not found: <1488314857-28327-9-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH v8 08/11] cryptouser.h: fix include from userland 2017-02-28 20:47 ` [PATCH v8 08/11] cryptouser.h: " Nicolas Dichtel @ 2017-03-01 4:52 ` Herbert Xu 0 siblings, 0 replies; 554+ messages in thread From: Herbert Xu @ 2017-03-01 4:52 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd-r2nGTMty4D4, mmarek-IBi9RG/b67k, linux-kbuild-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-arch-u79uwXL29TY76Z2rM5mHXA, airlied-cv59FeDIM0c, davem-fT/PcQaiUtIeIZ0/mPfg9Q, linux-I+IVW8TIWO2tmTQ+vhA3Yw, bp-Gina5bIWoIWzQB+pC5nmwQ, slash.tmp-GANU6spQydw, daniel.vetter-/w4YWyX8dFk, rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw, msalter-H+wXaHxf7aLQT0dZR+AlfA, jengelh-9+2X+4sQBs8, hch-wEGCiKHe2LqWVfeAwA7xHQ, tklauser-93Khv+1bN0NyDzI6CaY1VQ, mpe-Gsx/Oe8HsFggBc27wqDAHg, mingo-DgEjT+Ai2ygdnm+yROfE0A, tglx-hfZtesqFncYOwBW4kG4KsQ, ldv-u2l5PoMzF/Vg9hUCZPvPmw, linux-rdma-u79uwXL29TY76Z2rM5mHXA On Tue, Feb 28, 2017 at 09:47:34PM +0100, Nicolas Dichtel wrote: > This patch prepares the uapi export by fixing the following error: > > .../linux/cryptouser.h:58:16: error: ‘CRYPTO_MAX_ALG_NAME’ undeclared here (not in a function) > char cru_name[CRYPTO_MAX_ALG_NAME]; > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> > --- > include/linux/crypto.h | 2 +- > include/uapi/linux/cryptouser.h | 7 +++++++ > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/include/linux/crypto.h b/include/linux/crypto.h > index c0b0cf3d2d2f..4cf29a35bb4b 100644 > --- a/include/linux/crypto.h > +++ b/include/linux/crypto.h > @@ -24,6 +24,7 @@ > #include <linux/slab.h> > #include <linux/string.h> > #include <linux/uaccess.h> > +#include <uapi/linux/cryptouser.h> Nack. cryptouser is just one interface in the crypto API. It should not be included by every single crypto user in the kernel. You could perhaps introduce a new file under uapi just for this. Cheers, -- Email: Herbert Xu <herbert-lOAM2aK0SrRLBo1qDEOMRrpzq4S04n8Q@public.gmane.org> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v8 08/11] cryptouser.h: fix include from userland @ 2017-03-01 4:52 ` Herbert Xu 0 siblings, 0 replies; 554+ messages in thread From: Herbert Xu @ 2017-03-01 4:52 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, linux-rdma On Tue, Feb 28, 2017 at 09:47:34PM +0100, Nicolas Dichtel wrote: > This patch prepares the uapi export by fixing the following error: > > .../linux/cryptouser.h:58:16: error: ‘CRYPTO_MAX_ALG_NAME’ undeclared here (not in a function) > char cru_name[CRYPTO_MAX_ALG_NAME]; > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > include/linux/crypto.h | 2 +- > include/uapi/linux/cryptouser.h | 7 +++++++ > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/include/linux/crypto.h b/include/linux/crypto.h > index c0b0cf3d2d2f..4cf29a35bb4b 100644 > --- a/include/linux/crypto.h > +++ b/include/linux/crypto.h > @@ -24,6 +24,7 @@ > #include <linux/slab.h> > #include <linux/string.h> > #include <linux/uaccess.h> > +#include <uapi/linux/cryptouser.h> Nack. cryptouser is just one interface in the crypto API. It should not be included by every single crypto user in the kernel. You could perhaps introduce a new file under uapi just for this. Cheers, -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v9 00/11] uapi: export all headers under uapi directories 2017-03-01 4:52 ` Herbert Xu (?) @ 2017-03-02 16:56 ` Nicolas Dichtel 2017-03-02 16:56 ` [PATCH v9 01/11] h8300: put bitsperlong.h in uapi Nicolas Dichtel ` (11 more replies) -1 siblings, 12 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-02 16:56 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma Patches #1 and #2 are just cleanup: some exported headers were still under a non-uapi directory. Patch #3 is a fix to avoid exporting a file that was not under an uapi directory. After these three patches, all exported headers are under an uapi directory: path #4 stops searching files in non uapi directories. The patch #5 was spotted by code review: there is no in-tree user of this functionality. Patch #6 fixes some warnings/errors reported by 0-day tests. Patch #7 to #9 fix some errors when the corresponding files are included by userland. Patches #10 and #11 remove the need to list explicitly headers. Now all files under an uapi directory are exported. This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. If I must rebase it against the kbuild tree, just tell me. Michal, is this series going through your tree? v8 -> v9: - rebase on top of linus tree - patch #8: add include/uapi/linux/crypto.h v7 -> v8: - rebase on top of linus tree - add patch #7, #8 and #9 v6 -> v7: - rebase on top of linus tree - patch #7: remove autogenerated files from the list in the commit log v5 -> v6: - patch #6: remove change of include/uapi/linux/media.h - patch #7: fix hdr export when 'make O=' is used (look for genhdr files in the right directory) - patch #8: fix 'make headers_check' v4 -> v5: - patch #3: get back to v3 (don't export msr-index.h) - patch #6: new in this version - patch #7: fix compilation by introducing header-n v3 -> v4: - first patch has been included - patch #4: get back to v2 and remove arch/x86/include/asm/msr-index.h v2 -> v3: - patch #1: remove arch/arm/include/asm/types.h - patch #2: remove arch/h8300/include/asm/bitsperlong.h - patch #3: remove arch/nios2/include/uapi/asm/setup.h - patch #4: don't export msr-index.h - patch #5: fix a typo: s/unput-files3-name/input-files3-name - patch #6: no change - patch #7: fix include/uapi/asm-generic/Kbuild.asm by introducing mandatory-y - add patch #8 v1 -> v2: - add patch #1 to #6 - patch #7: remove use of header-y Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v9 01/11] h8300: put bitsperlong.h in uapi 2017-03-02 16:56 ` [PATCH v9 00/11] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-03-02 16:56 ` Nicolas Dichtel 2017-03-02 16:56 ` [PATCH v9 02/11] nios2: put setup.h " Nicolas Dichtel ` (10 subsequent siblings) 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-02 16:56 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 14 -------------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h deleted file mode 100644 index e140e46729ac..000000000000 --- a/arch/h8300/include/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __ASM_H8300_BITS_PER_LONG -#define __ASM_H8300_BITS_PER_LONG - -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif - -#endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v9 02/11] nios2: put setup.h in uapi 2017-03-02 16:56 ` [PATCH v9 00/11] uapi: export all headers under uapi directories Nicolas Dichtel 2017-03-02 16:56 ` [PATCH v9 01/11] h8300: put bitsperlong.h in uapi Nicolas Dichtel @ 2017-03-02 16:56 ` Nicolas Dichtel 2017-03-02 16:56 ` [PATCH v9 03/11] x86: stop exporting msr-index.h to userland Nicolas Dichtel ` (9 subsequent siblings) 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-02 16:56 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This header file is exported, but from a userland pov, it's just a wrapper to asm-generic/setup.h. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: Tobias Klauser <tklauser@distanz.ch> --- arch/nios2/include/uapi/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..69c965304146 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -2,4 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h +generic-y += setup.h generic-y += ucontext.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v9 03/11] x86: stop exporting msr-index.h to userland 2017-03-02 16:56 ` [PATCH v9 00/11] uapi: export all headers under uapi directories Nicolas Dichtel 2017-03-02 16:56 ` [PATCH v9 01/11] h8300: put bitsperlong.h in uapi Nicolas Dichtel 2017-03-02 16:56 ` [PATCH v9 02/11] nios2: put setup.h " Nicolas Dichtel @ 2017-03-02 16:56 ` Nicolas Dichtel 2017-03-02 16:56 ` [PATCH v9 04/11] Makefile.headersinst: cleanup input files Nicolas Dichtel ` (8 subsequent siblings) 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-02 16:56 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma Even if this file was not in an uapi directory, it was exported because it was listed in the Kbuild file. Fixes: b72e7464e4cf ("x86/uapi: Do not export <asm/msr-index.h> as part of the user API headers") Suggested-by: Borislav Petkov <bp@alien8.de> CC: Ingo Molnar <mingo@kernel.org> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Ingo Molnar <mingo@kernel.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> --- arch/x86/include/uapi/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..1c532b3f18ea 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -27,7 +27,6 @@ header-y += ldt.h header-y += mce.h header-y += mman.h header-y += msgbuf.h -header-y += msr-index.h header-y += msr.h header-y += mtrr.h header-y += param.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v9 04/11] Makefile.headersinst: cleanup input files 2017-03-02 16:56 ` [PATCH v9 00/11] uapi: export all headers under uapi directories Nicolas Dichtel ` (2 preceding siblings ...) 2017-03-02 16:56 ` [PATCH v9 03/11] x86: stop exporting msr-index.h to userland Nicolas Dichtel @ 2017-03-02 16:56 ` Nicolas Dichtel 2017-03-02 16:56 ` [PATCH v9 05/11] Makefile.headersinst: remove destination-y option Nicolas Dichtel ` (7 subsequent siblings) 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-02 16:56 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that input-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v9 05/11] Makefile.headersinst: remove destination-y option 2017-03-02 16:56 ` [PATCH v9 00/11] uapi: export all headers under uapi directories Nicolas Dichtel ` (3 preceding siblings ...) 2017-03-02 16:56 ` [PATCH v9 04/11] Makefile.headersinst: cleanup input files Nicolas Dichtel @ 2017-03-02 16:56 ` Nicolas Dichtel 2017-03-02 16:56 ` [PATCH v9 06/11] uapi: includes linux/types.h before exporting files Nicolas Dichtel ` (6 subsequent siblings) 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-02 16:56 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Paul Bolle <pebolle@tiscali.nl> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v9 06/11] uapi: includes linux/types.h before exporting files 2017-03-02 16:56 ` [PATCH v9 00/11] uapi: export all headers under uapi directories Nicolas Dichtel ` (4 preceding siblings ...) 2017-03-02 16:56 ` [PATCH v9 05/11] Makefile.headersinst: remove destination-y option Nicolas Dichtel @ 2017-03-02 16:56 ` Nicolas Dichtel 2017-03-02 16:56 ` [PATCH v9 07/11] btrfs_tree.h: fix include from userland Nicolas Dichtel ` (5 subsequent siblings) 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-02 16:56 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma Some files will be exported after the next patch. 0-day tests report the following warning/error: ./usr/include/linux/bcache.h:8: include of <linux/types.h> is preferred over <asm/types.h> ./usr/include/linux/bcache.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/qrtr.h:8: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/cryptouser.h:39: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/pr.h:14: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/btrfs_tree.h:337: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/rdma/bnxt_re-abi.h:45: found __[us]{8,16,32,64} type without #include <linux/types.h> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/uapi/linux/bcache.h | 2 +- include/uapi/linux/btrfs_tree.h | 2 ++ include/uapi/linux/cryptouser.h | 2 ++ include/uapi/linux/pr.h | 2 ++ include/uapi/linux/qrtr.h | 1 + include/uapi/rdma/bnxt_re-abi.h | 2 ++ 6 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h index 22b6ad31c706..e3bb0635e94a 100644 --- a/include/uapi/linux/bcache.h +++ b/include/uapi/linux/bcache.h @@ -5,7 +5,7 @@ * Bcache on disk data structures */ -#include <asm/types.h> +#include <linux/types.h> #define BITMASK(name, type, field, offset, size) \ static inline __u64 name(const type *k) \ diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h index d5ad15a106a7..6a261cb52d95 100644 --- a/include/uapi/linux/btrfs_tree.h +++ b/include/uapi/linux/btrfs_tree.h @@ -1,6 +1,8 @@ #ifndef _BTRFS_CTREE_H_ #define _BTRFS_CTREE_H_ +#include <linux/types.h> + /* * This header contains the structure definitions and constants used * by file system objects that can be retrieved using diff --git a/include/uapi/linux/cryptouser.h b/include/uapi/linux/cryptouser.h index 11d21fce14d6..c6a09c5261e7 100644 --- a/include/uapi/linux/cryptouser.h +++ b/include/uapi/linux/cryptouser.h @@ -18,6 +18,8 @@ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <linux/types.h> + /* Netlink configuration messages. */ enum { CRYPTO_MSG_BASE = 0x10, diff --git a/include/uapi/linux/pr.h b/include/uapi/linux/pr.h index 57d7c0f916b6..645ef3cf3dd0 100644 --- a/include/uapi/linux/pr.h +++ b/include/uapi/linux/pr.h @@ -1,6 +1,8 @@ #ifndef _UAPI_PR_H #define _UAPI_PR_H +#include <linux/types.h> + enum pr_type { PR_WRITE_EXCLUSIVE = 1, PR_EXCLUSIVE_ACCESS = 2, diff --git a/include/uapi/linux/qrtr.h b/include/uapi/linux/qrtr.h index 66c0748d26e2..b14ee91ec387 100644 --- a/include/uapi/linux/qrtr.h +++ b/include/uapi/linux/qrtr.h @@ -1,6 +1,7 @@ #ifndef _LINUX_QRTR_H #define _LINUX_QRTR_H +#include <linux/types.h> #include <linux/socket.h> struct sockaddr_qrtr { diff --git a/include/uapi/rdma/bnxt_re-abi.h b/include/uapi/rdma/bnxt_re-abi.h index e2c8a3f0ccec..74018bd18d72 100644 --- a/include/uapi/rdma/bnxt_re-abi.h +++ b/include/uapi/rdma/bnxt_re-abi.h @@ -39,6 +39,8 @@ #ifndef __BNXT_RE_UVERBS_ABI_H__ #define __BNXT_RE_UVERBS_ABI_H__ +#include <linux/types.h> + #define BNXT_RE_ABI_VERSION 1 struct bnxt_re_uctx_resp { -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v9 07/11] btrfs_tree.h: fix include from userland 2017-03-02 16:56 ` [PATCH v9 00/11] uapi: export all headers under uapi directories Nicolas Dichtel ` (5 preceding siblings ...) 2017-03-02 16:56 ` [PATCH v9 06/11] uapi: includes linux/types.h before exporting files Nicolas Dichtel @ 2017-03-02 16:56 ` Nicolas Dichtel 2017-03-02 16:56 ` [PATCH v9 08/11] cryptouser.h: " Nicolas Dichtel ` (4 subsequent siblings) 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-02 16:56 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This patch prepares the uapi export by fixing the following errors: .../linux/btrfs_tree.h:283:2: error: #error "UUID items require BTRFS_UUID_SIZE == 16!" #error "UUID items require BTRFS_UUID_SIZE == 16!" .../linux/btrfs_tree.h:390:12: error: ‘BTRFS_UUID_SIZE’ undeclared here (not in a function) __u8 uuid[BTRFS_UUID_SIZE]; ^ .../linux/btrfs_tree.h:796:16: error: ‘BTRFS_DEV_STAT_VALUES_MAX’ undeclared here (not in a function) __le64 values[BTRFS_DEV_STAT_VALUES_MAX]; Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/uapi/linux/btrfs_tree.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h index 6a261cb52d95..6a754ada59af 100644 --- a/include/uapi/linux/btrfs_tree.h +++ b/include/uapi/linux/btrfs_tree.h @@ -2,6 +2,7 @@ #define _BTRFS_CTREE_H_ #include <linux/types.h> +#include <linux/btrfs.h> /* * This header contains the structure definitions and constants used -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v9 08/11] cryptouser.h: fix include from userland 2017-03-02 16:56 ` [PATCH v9 00/11] uapi: export all headers under uapi directories Nicolas Dichtel ` (6 preceding siblings ...) 2017-03-02 16:56 ` [PATCH v9 07/11] btrfs_tree.h: fix include from userland Nicolas Dichtel @ 2017-03-02 16:56 ` Nicolas Dichtel 2017-03-03 9:35 ` Herbert Xu [not found] ` <1488473802-13354-1-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> ` (3 subsequent siblings) 11 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-02 16:56 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This patch prepares the uapi export by fixing the following error: .../linux/cryptouser.h:58:16: error: ‘CRYPTO_MAX_ALG_NAME’ undeclared here (not in a function) char cru_name[CRYPTO_MAX_ALG_NAME]; Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/linux/crypto.h | 2 +- include/uapi/linux/crypto.h | 14 ++++++++++++++ include/uapi/linux/cryptouser.h | 6 ++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 include/uapi/linux/crypto.h diff --git a/include/linux/crypto.h b/include/linux/crypto.h index c0b0cf3d2d2f..cc2425ba8527 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -24,6 +24,7 @@ #include <linux/slab.h> #include <linux/string.h> #include <linux/uaccess.h> +#include <uapi/linux/crypto.h> /* * Autoloaded crypto modules should only use a prefixed name to avoid allowing @@ -123,7 +124,6 @@ /* * Miscellaneous stuff. */ -#define CRYPTO_MAX_ALG_NAME 64 /* * The macro CRYPTO_MINALIGN_ATTR (along with the void * type in the actual diff --git a/include/uapi/linux/crypto.h b/include/uapi/linux/crypto.h new file mode 100644 index 000000000000..e342c5a5ac50 --- /dev/null +++ b/include/uapi/linux/crypto.h @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2017 Nicolas Dichtel <nicolas.dichtel@6wind.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + */ + +#ifndef _UAPI_CRYPTO_H +#define _UAPI_CRYPTO_H + +#define CRYPTO_MAX_ALG_NAME 64 + +#endif /* _UAPI_CRYPTO_H */ diff --git a/include/uapi/linux/cryptouser.h b/include/uapi/linux/cryptouser.h index c6a09c5261e7..ce3c64fb89e1 100644 --- a/include/uapi/linux/cryptouser.h +++ b/include/uapi/linux/cryptouser.h @@ -18,7 +18,11 @@ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef _UAPI_CRYPTOUSER_H +#define _UAPI_CRYPTOUSER_H + #include <linux/types.h> +#include <linux/crypto.h> /* Netlink configuration messages. */ enum { @@ -121,3 +125,5 @@ struct crypto_report_acomp { #define CRYPTO_REPORT_MAXSIZE (sizeof(struct crypto_user_alg) + \ sizeof(struct crypto_report_blkcipher)) + +#endif /* _UAPI_CRYPTOUSER_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v9 08/11] cryptouser.h: fix include from userland 2017-03-02 16:56 ` [PATCH v9 08/11] cryptouser.h: " Nicolas Dichtel @ 2017-03-03 9:35 ` Herbert Xu 0 siblings, 0 replies; 554+ messages in thread From: Herbert Xu @ 2017-03-03 9:35 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, linux-rdma On Thu, Mar 02, 2017 at 05:56:39PM +0100, Nicolas Dichtel wrote: > This patch prepares the uapi export by fixing the following error: > > .../linux/cryptouser.h:58:16: error: ‘CRYPTO_MAX_ALG_NAME’ undeclared here (not in a function) > char cru_name[CRYPTO_MAX_ALG_NAME]; > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt ^ permalink raw reply [flat|nested] 554+ messages in thread
[parent not found: <1488473802-13354-1-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>]
* [PATCH v9 09/11] smc_diag.h: fix include from userland 2017-03-02 16:56 ` [PATCH v9 00/11] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-03-02 16:56 ` Nicolas Dichtel 2017-03-02 16:56 ` [PATCH v9 02/11] nios2: put setup.h " Nicolas Dichtel ` (10 subsequent siblings) 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-02 16:56 UTC (permalink / raw) To: arnd-r2nGTMty4D4, mmarek-IBi9RG/b67k Cc: linux-kbuild-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-arch-u79uwXL29TY76Z2rM5mHXA, airlied-cv59FeDIM0c, davem-fT/PcQaiUtIeIZ0/mPfg9Q, linux-I+IVW8TIWO2tmTQ+vhA3Yw, bp-Gina5bIWoIWzQB+pC5nmwQ, slash.tmp-GANU6spQydw, daniel.vetter-/w4YWyX8dFk, rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw, msalter-H+wXaHxf7aLQT0dZR+AlfA, jengelh-9+2X+4sQBs8, hch-wEGCiKHe2LqWVfeAwA7xHQ, tklauser-93Khv+1bN0NyDzI6CaY1VQ, mpe-Gsx/Oe8HsFggBc27wqDAHg, mingo-DgEjT+Ai2ygdnm+yROfE0A, tglx-hfZtesqFncYOwBW4kG4KsQ, ldv-u2l5PoMzF/Vg9hUCZPvPmw, nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w, herbert-lOAM2aK0SrRLBo1qDEOMRrpzq4S04n8Q, linux-rdma-u79uwXL29TY76Z2rM5mHXA This patch prepares the uapi export by fixing the following error: .../linux/smc_diag.h:6:27: fatal error: rdma/ib_verbs.h: No such file or directory #include <rdma/ib_verbs.h> Signed-off-by: Nicolas Dichtel <nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> --- include/rdma/ib_verbs.h | 3 +-- include/uapi/linux/smc_diag.h | 2 +- include/uapi/rdma/ib_user_verbs.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 0f1813c13687..50f276a4afdc 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -61,6 +61,7 @@ #include <linux/mmu_notifier.h> #include <linux/uaccess.h> #include <linux/cgroup_rdma.h> +#include <uapi/rdma/ib_user_verbs.h> extern struct workqueue_struct *ib_wq; extern struct workqueue_struct *ib_comp_wq; @@ -1838,8 +1839,6 @@ enum ib_mad_result { IB_MAD_RESULT_CONSUMED = 1 << 2 /* Packet consumed: stop processing */ }; -#define IB_DEVICE_NAME_MAX 64 - struct ib_port_cache { struct ib_pkey_cache *pkey; struct ib_gid_table *gid; diff --git a/include/uapi/linux/smc_diag.h b/include/uapi/linux/smc_diag.h index 0063919fea34..87712bfaa9dd 100644 --- a/include/uapi/linux/smc_diag.h +++ b/include/uapi/linux/smc_diag.h @@ -3,7 +3,7 @@ #include <linux/types.h> #include <linux/inet_diag.h> -#include <rdma/ib_verbs.h> +#include <rdma/ib_user_verbs.h> /* Request structure */ struct smc_diag_req { diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h index 997f904c7692..8edce2b65903 100644 --- a/include/uapi/rdma/ib_user_verbs.h +++ b/include/uapi/rdma/ib_user_verbs.h @@ -1124,4 +1124,6 @@ struct ib_uverbs_ex_destroy_rwq_ind_table { __u32 ind_tbl_handle; }; +#define IB_DEVICE_NAME_MAX 64 + #endif /* IB_USER_VERBS_H */ -- 2.8.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v9 09/11] smc_diag.h: fix include from userland @ 2017-03-02 16:56 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-02 16:56 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This patch prepares the uapi export by fixing the following error: .../linux/smc_diag.h:6:27: fatal error: rdma/ib_verbs.h: No such file or directory #include <rdma/ib_verbs.h> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/rdma/ib_verbs.h | 3 +-- include/uapi/linux/smc_diag.h | 2 +- include/uapi/rdma/ib_user_verbs.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 0f1813c13687..50f276a4afdc 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -61,6 +61,7 @@ #include <linux/mmu_notifier.h> #include <linux/uaccess.h> #include <linux/cgroup_rdma.h> +#include <uapi/rdma/ib_user_verbs.h> extern struct workqueue_struct *ib_wq; extern struct workqueue_struct *ib_comp_wq; @@ -1838,8 +1839,6 @@ enum ib_mad_result { IB_MAD_RESULT_CONSUMED = 1 << 2 /* Packet consumed: stop processing */ }; -#define IB_DEVICE_NAME_MAX 64 - struct ib_port_cache { struct ib_pkey_cache *pkey; struct ib_gid_table *gid; diff --git a/include/uapi/linux/smc_diag.h b/include/uapi/linux/smc_diag.h index 0063919fea34..87712bfaa9dd 100644 --- a/include/uapi/linux/smc_diag.h +++ b/include/uapi/linux/smc_diag.h @@ -3,7 +3,7 @@ #include <linux/types.h> #include <linux/inet_diag.h> -#include <rdma/ib_verbs.h> +#include <rdma/ib_user_verbs.h> /* Request structure */ struct smc_diag_req { diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h index 997f904c7692..8edce2b65903 100644 --- a/include/uapi/rdma/ib_user_verbs.h +++ b/include/uapi/rdma/ib_user_verbs.h @@ -1124,4 +1124,6 @@ struct ib_uverbs_ex_destroy_rwq_ind_table { __u32 ind_tbl_handle; }; +#define IB_DEVICE_NAME_MAX 64 + #endif /* IB_USER_VERBS_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v9 10/11] uapi: export all headers under uapi directories 2017-03-02 16:56 ` [PATCH v9 00/11] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-03-02 16:56 ` Nicolas Dichtel 2017-03-02 16:56 ` [PATCH v9 02/11] nios2: put setup.h " Nicolas Dichtel ` (10 subsequent siblings) 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-02 16:56 UTC (permalink / raw) To: arnd-r2nGTMty4D4, mmarek-IBi9RG/b67k Cc: linux-kbuild-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-arch-u79uwXL29TY76Z2rM5mHXA, airlied-cv59FeDIM0c, davem-fT/PcQaiUtIeIZ0/mPfg9Q, linux-I+IVW8TIWO2tmTQ+vhA3Yw, bp-Gina5bIWoIWzQB+pC5nmwQ, slash.tmp-GANU6spQydw, daniel.vetter-/w4YWyX8dFk, rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw, msalter-H+wXaHxf7aLQT0dZR+AlfA, jengelh-9+2X+4sQBs8, hch-wEGCiKHe2LqWVfeAwA7xHQ, tklauser-93Khv+1bN0NyDzI6CaY1VQ, mpe-Gsx/Oe8HsFggBc27wqDAHg, mingo-DgEjT+Ai2ygdnm+yROfE0A, tglx-hfZtesqFncYOwBW4kG4KsQ, ldv-u2l5PoMzF/Vg9hUCZPvPmw, nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w, herbert-lOAM2aK0SrRLBo1qDEOMRrpzq4S04n8Q, linux-rdma-u79uwXL29TY76Z2rM5mHXA Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-arc/kvm_para.h asm-arc/ucontext.h asm-avr32/kvm_para.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-c6x/shmparam.h asm-c6x/ucontext.h asm-cris/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-hexagon/shmparam.h asm-m32r/kvm_para.h asm-m68k/kvm_para.h asm-m68k/shmparam.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-mips/hwcap.h asm-mips/reg.h asm-mips/ucontext.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-openrisc/shmparam.h asm-parisc/kvm_para.h asm-powerpc/perf_regs.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-tile/shmparam.h asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-x86/hwcap2.h asm-xtensa/kvm_para.h drm/armada_drm.h drm/etnaviv_drm.h drm/vgem_drm.h linux/auto_dev-ioctl.h linux/bcache.h linux/btrfs_tree.h linux/cifs linux/cifs/cifs_mount.h linux/coresight-stm.h linux/cryptouser.h linux/genwqe linux/genwqe/genwqe_card.h linux/hash_info.h linux/kcm.h linux/kcov.h linux/kfd_ioctl.h linux/lightnvm.h linux/module.h linux/nilfs2_api.h linux/nilfs2_ondisk.h linux/nsfs.h linux/pr.h linux/qrtr.h linux/rpmsg.h linux/sed-opal.h linux/smc.h linux/smc_diag.h linux/stm.h linux/userio.h linux/wil6210_uapi.h rdma/bnxt_re-abi.h Note that I have removed from this list the files which are generated in every exported directories (like .install or .install.cmd). Thanks to Julien Floret <julien.floret-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> for the tip to get all subdirs with a pure makefile command. For the record, note that exported files for asm directories are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/<arch>/include/uapi/asm/Kbuild; - arch/<arch>/include/asm/Kbuild. Signed-off-by: Nicolas Dichtel <nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> Acked-by: Daniel Vetter <daniel.vetter-/w4YWyX8dFk@public.gmane.org> Acked-by: Russell King <rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org> Acked-by: Mark Salter <msalter-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Acked-by: Michael Ellerman <mpe-Gsx/Oe8HsFggBc27wqDAHg@public.gmane.org> (powerpc) --- Documentation/kbuild/makefiles.txt | 66 ++-- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 - arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 3 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 53 --- arch/score/include/asm/Kbuild | 3 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 58 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 -- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 23 -- include/uapi/linux/Kbuild | 493 +--------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 - include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 16 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 20 -- include/uapi/rdma/hfi/Kbuild | 3 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 51 +-- 81 files changed, 113 insertions(+), 1756 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..91ffb391ed54 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,10 +44,12 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 header-n --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y + --- 7.5 mandatory-y + --- 7.6 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1235,7 +1237,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1264,30 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. -See subsequent chapter for the syntax of the Kbuild file. - - --- 7.1 header-y - - header-y specifies header files to be exported. - - Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. - The convention is to list one file per line and - preferably in alphabetic order. +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. +See subsequent chapter for the syntax of the Kbuild file. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. + --- 7.1 header-n - Subdirectories are visited before their parent directories. + header-n is essentially used by include/uapi/linux/Kbuild to avoid + exporting specific headers (e.g. kvm.h) on architectures that do not + support it. It should be avoided as much as possible. --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y @@ -1334,6 +1329,27 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h + --- 7.5 mandatory-y + + mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm + to define the minimun set of headers that must be exported in + include/asm. + + The convention is to list one subdir per line and + preferably in alphabetic order. + + --- 7.6 subdir-y + + subdir-y may be used to specify a subdirectory to be exported. + + Example: + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ + + The convention is to list one subdir per line and + preferably in alphabetic order. + === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index 797b64a4b80b..65f48073f8ac 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 69c965304146..374bd123329f 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,6 +1,5 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h - generic-y += setup.h generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index fb01873a5aad..1b533a107f19 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bitsperlong.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index 6848ba5c1454..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,55 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += pkey.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index 926943a49ea5..4ee7fc77d23c 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += - generic-y += barrier.h generic-y += clkdev.h generic-y += current.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index aa48b6eaff2d..61157a7e8532 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 1c532b3f18ea..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,61 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..8e6b335664f2 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +mandatory-y += auxvec.h +mandatory-y += bitsperlong.h +mandatory-y += byteorder.h +mandatory-y += errno.h +mandatory-y += fcntl.h +mandatory-y += ioctl.h +mandatory-y += ioctls.h +mandatory-y += ipcbuf.h +mandatory-y += mman.h +mandatory-y += msgbuf.h +mandatory-y += param.h +mandatory-y += poll.h +mandatory-y += posix_types.h +mandatory-y += ptrace.h +mandatory-y += resource.h +mandatory-y += sembuf.h +mandatory-y += setup.h +mandatory-y += shmbuf.h +mandatory-y += sigcontext.h +mandatory-y += siginfo.h +mandatory-y += signal.h +mandatory-y += socket.h +mandatory-y += sockios.h +mandatory-y += stat.h +mandatory-y += statfs.h +mandatory-y += swab.h +mandatory-y += termbits.h +mandatory-y += termios.h +mandatory-y += types.h +mandatory-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +mandatory-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index c97addd08f8c..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,23 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += omap_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index 1c80efb67d10..456cbe8a2aad 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -1,491 +1,16 @@ # UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) +header-n += a.out.h endif -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += batman_adv.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dma-buf.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += ife.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) +header-n += kvm.h endif - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) +header-n += kvm_para.h endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += psample.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += seg6_genl.h -header-y += seg6.h -header-y += seg6_hmac.h -header-y += seg6_iptunnel.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += timerfd.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index ba62ddf0e58a..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_sample.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 1e0af1ff75c3..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,20 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += rdma_user_ioctl.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h -header-y += qedr-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index b65b0b3a5f63..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h -header-y += hfi1_ioctl.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..122945618ae2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,19 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +27,15 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +srcdir := $(srctree)/$(obj) +gendir := $(objtree)/$(gen) +subdirs := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srcdir)/*.h)) +header-files += $(notdir $(wildcard $(srcdir)/*.agh)) +header-files := $(filter-out $(header-n), $(header-files)) +genhdr-files := $(notdir $(wildcard $(gendir)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,25 +43,20 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) - -srcdir := $(srctree)/$(obj) -gendir := $(objtree)/$(gen) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) +ifneq ($(mandatory-y),) +missing := $(filter-out $(all-files),$(mandatory-y)) +ifneq ($(missing),) +$(error Some mandatory headers ($(missing)) are missing in $(obj)) +endif +endif # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -67,8 +70,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v9 10/11] uapi: export all headers under uapi directories @ 2017-03-02 16:56 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-02 16:56 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-arc/kvm_para.h asm-arc/ucontext.h asm-avr32/kvm_para.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-c6x/shmparam.h asm-c6x/ucontext.h asm-cris/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-hexagon/shmparam.h asm-m32r/kvm_para.h asm-m68k/kvm_para.h asm-m68k/shmparam.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-mips/hwcap.h asm-mips/reg.h asm-mips/ucontext.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-openrisc/shmparam.h asm-parisc/kvm_para.h asm-powerpc/perf_regs.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-tile/shmparam.h asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-x86/hwcap2.h asm-xtensa/kvm_para.h drm/armada_drm.h drm/etnaviv_drm.h drm/vgem_drm.h linux/auto_dev-ioctl.h linux/bcache.h linux/btrfs_tree.h linux/cifs linux/cifs/cifs_mount.h linux/coresight-stm.h linux/cryptouser.h linux/genwqe linux/genwqe/genwqe_card.h linux/hash_info.h linux/kcm.h linux/kcov.h linux/kfd_ioctl.h linux/lightnvm.h linux/module.h linux/nilfs2_api.h linux/nilfs2_ondisk.h linux/nsfs.h linux/pr.h linux/qrtr.h linux/rpmsg.h linux/sed-opal.h linux/smc.h linux/smc_diag.h linux/stm.h linux/userio.h linux/wil6210_uapi.h rdma/bnxt_re-abi.h Note that I have removed from this list the files which are generated in every exported directories (like .install or .install.cmd). Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. For the record, note that exported files for asm directories are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/<arch>/include/uapi/asm/Kbuild; - arch/<arch>/include/asm/Kbuild. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Mark Salter <msalter@redhat.com> Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) --- Documentation/kbuild/makefiles.txt | 66 ++-- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 - arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 3 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 53 --- arch/score/include/asm/Kbuild | 3 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 58 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 -- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 23 -- include/uapi/linux/Kbuild | 493 +--------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 - include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 16 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 20 -- include/uapi/rdma/hfi/Kbuild | 3 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 51 +-- 81 files changed, 113 insertions(+), 1756 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..91ffb391ed54 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,10 +44,12 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 header-n --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y + --- 7.5 mandatory-y + --- 7.6 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1235,7 +1237,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1264,30 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. -See subsequent chapter for the syntax of the Kbuild file. - - --- 7.1 header-y - - header-y specifies header files to be exported. - - Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. - The convention is to list one file per line and - preferably in alphabetic order. +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. +See subsequent chapter for the syntax of the Kbuild file. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. + --- 7.1 header-n - Subdirectories are visited before their parent directories. + header-n is essentially used by include/uapi/linux/Kbuild to avoid + exporting specific headers (e.g. kvm.h) on architectures that do not + support it. It should be avoided as much as possible. --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y @@ -1334,6 +1329,27 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h + --- 7.5 mandatory-y + + mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm + to define the minimun set of headers that must be exported in + include/asm. + + The convention is to list one subdir per line and + preferably in alphabetic order. + + --- 7.6 subdir-y + + subdir-y may be used to specify a subdirectory to be exported. + + Example: + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ + + The convention is to list one subdir per line and + preferably in alphabetic order. + === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index 797b64a4b80b..65f48073f8ac 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 69c965304146..374bd123329f 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,6 +1,5 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h - generic-y += setup.h generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index fb01873a5aad..1b533a107f19 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bitsperlong.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index 6848ba5c1454..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,55 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += pkey.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index 926943a49ea5..4ee7fc77d23c 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += - generic-y += barrier.h generic-y += clkdev.h generic-y += current.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index aa48b6eaff2d..61157a7e8532 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 1c532b3f18ea..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,61 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..8e6b335664f2 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +mandatory-y += auxvec.h +mandatory-y += bitsperlong.h +mandatory-y += byteorder.h +mandatory-y += errno.h +mandatory-y += fcntl.h +mandatory-y += ioctl.h +mandatory-y += ioctls.h +mandatory-y += ipcbuf.h +mandatory-y += mman.h +mandatory-y += msgbuf.h +mandatory-y += param.h +mandatory-y += poll.h +mandatory-y += posix_types.h +mandatory-y += ptrace.h +mandatory-y += resource.h +mandatory-y += sembuf.h +mandatory-y += setup.h +mandatory-y += shmbuf.h +mandatory-y += sigcontext.h +mandatory-y += siginfo.h +mandatory-y += signal.h +mandatory-y += socket.h +mandatory-y += sockios.h +mandatory-y += stat.h +mandatory-y += statfs.h +mandatory-y += swab.h +mandatory-y += termbits.h +mandatory-y += termios.h +mandatory-y += types.h +mandatory-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +mandatory-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index c97addd08f8c..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,23 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += omap_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index 1c80efb67d10..456cbe8a2aad 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -1,491 +1,16 @@ # UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) +header-n += a.out.h endif -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += batman_adv.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dma-buf.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += ife.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) +header-n += kvm.h endif - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) +header-n += kvm_para.h endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += psample.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += seg6_genl.h -header-y += seg6.h -header-y += seg6_hmac.h -header-y += seg6_iptunnel.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += timerfd.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index ba62ddf0e58a..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_sample.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 1e0af1ff75c3..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,20 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += rdma_user_ioctl.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h -header-y += qedr-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index b65b0b3a5f63..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h -header-y += hfi1_ioctl.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..122945618ae2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,19 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +27,15 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +srcdir := $(srctree)/$(obj) +gendir := $(objtree)/$(gen) +subdirs := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srcdir)/*.h)) +header-files += $(notdir $(wildcard $(srcdir)/*.agh)) +header-files := $(filter-out $(header-n), $(header-files)) +genhdr-files := $(notdir $(wildcard $(gendir)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,25 +43,20 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) - -srcdir := $(srctree)/$(obj) -gendir := $(objtree)/$(gen) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) +ifneq ($(mandatory-y),) +missing := $(filter-out $(all-files),$(mandatory-y)) +ifneq ($(missing),) +$(error Some mandatory headers ($(missing)) are missing in $(obj)) +endif +endif # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -67,8 +70,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v9 11/11] uapi: export all arch specifics directories 2017-03-02 16:56 ` [PATCH v9 00/11] uapi: export all headers under uapi directories Nicolas Dichtel ` (8 preceding siblings ...) [not found] ` <1488473802-13354-1-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> @ 2017-03-02 16:56 ` Nicolas Dichtel 2017-03-03 17:07 ` [PATCH v9 00/11] uapi: export all headers under uapi directories Nicolas Dichtel 2017-03-10 16:34 ` Nicolas Dichtel 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-02 16:56 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This patch removes the need of subdir-y. Now all files/directories under arch/<arch>/include/uapi/ are exported. The only change for userland is the layout of the command 'make headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. Those new directories contains all files/directories of the specified arch. Note that only cris and tile have more directories than only asm: - arch-v[10|32] for cris; - arch for tile. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 15 +-------------- Makefile | 6 +++--- arch/cris/include/uapi/asm/Kbuild | 3 --- arch/tile/include/uapi/asm/Kbuild | 2 -- scripts/Makefile.headersinst | 3 +-- 5 files changed, 5 insertions(+), 24 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 91ffb391ed54..223b33d5195a 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -49,7 +49,6 @@ This document describes the Linux kernel Makefiles. --- 7.3 generic-y --- 7.4 generated-y --- 7.5 mandatory-y - --- 7.6 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1265,7 +1264,7 @@ The pre-processing does: - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) All headers under include/uapi/, include/generated/uapi/, -arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/ are exported. A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and @@ -1338,18 +1337,6 @@ See subsequent chapter for the syntax of the Kbuild file. The convention is to list one subdir per line and preferably in alphabetic order. - --- 7.6 subdir-y - - subdir-y may be used to specify a subdirectory to be exported. - - Example: - #arch/cris/include/uapi/asm/Kbuild - subdir-y += ../arch-v10/arch/ - subdir-y += ../arch-v32/arch/ - - The convention is to list one subdir per line and - preferably in alphabetic order. - === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/Makefile b/Makefile index 4cb6b0a1152b..e9ac52330215 100644 --- a/Makefile +++ b/Makefile @@ -1128,7 +1128,7 @@ firmware_install: export INSTALL_HDR_PATH = $(objtree)/usr # If we do an all arch process set dst to asm-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) PHONY += archheaders archheaders: @@ -1149,7 +1149,7 @@ headers_install: __headers $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all @@ -1158,7 +1158,7 @@ headers_check_all: headers_install_all PHONY += headers_check headers_check: headers_install $(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1 - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1 + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/ $(hdr-dst) HDRCHECK=1 # --------------------------------------------------------------------------- # Kernel selftest diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d0c5471856e0..b15bf6bc0e94 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -subdir-y += ../arch-v10/arch/ -subdir-y += ../arch-v32/arch/ diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index e0a50111e07f..0c74c3c5ebfa 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -2,5 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ucontext.h - -subdir-y += ../arch diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 122945618ae2..1aeb4f45208f 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -2,7 +2,7 @@ # Installing headers # # All headers under include/uapi, include/generated/uapi, -# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are # exported. # They are preprocessed to remove __KERNEL__ section of the file. # @@ -30,7 +30,6 @@ installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) subdirs := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/*/.)) -subdirs += $(subdir-y) header-files := $(notdir $(wildcard $(srcdir)/*.h)) header-files += $(notdir $(wildcard $(srcdir)/*.agh)) header-files := $(filter-out $(header-n), $(header-files)) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v9 00/11] uapi: export all headers under uapi directories 2017-03-02 16:56 ` [PATCH v9 00/11] uapi: export all headers under uapi directories Nicolas Dichtel ` (9 preceding siblings ...) 2017-03-02 16:56 ` [PATCH v9 11/11] uapi: export all arch specifics directories Nicolas Dichtel @ 2017-03-03 17:07 ` Nicolas Dichtel 2017-03-10 16:34 ` Nicolas Dichtel 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-03 17:07 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, herbert, linux-rdma, Stephen Rothwell Le 02/03/2017 à 17:56, Nicolas Dichtel a écrit : > Patches #1 and #2 are just cleanup: some exported headers were still under > a non-uapi directory. Patch #3 is a fix to avoid exporting a file that was > not under an uapi directory. > After these three patches, all exported headers are under an uapi directory: > path #4 stops searching files in non uapi directories. > The patch #5 was spotted by code review: there is no in-tree user of this > functionality. > Patch #6 fixes some warnings/errors reported by 0-day tests. > Patch #7 to #9 fix some errors when the corresponding files are included by > userland. > Patches #10 and #11 remove the need to list explicitly headers. Now all files > under an uapi directory are exported. > > This series has been tested with a 'make headers_install' on x86 and a > 'make headers_install_all'. I've checked the result of both commands. > > This patch is built against linus tree. If I must rebase it against the kbuild > tree, just tell me. > Michal, is this series going through your tree? I'm a bit pushy on this, but it would be nice to get this series in before the rc1. In fact, it would certainly be better to have this living some times in -next, but it would probably generate a lot of conflicts in linux-next. OTOH those conflicts would be easy to solve. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v9 00/11] uapi: export all headers under uapi directories 2017-03-02 16:56 ` [PATCH v9 00/11] uapi: export all headers under uapi directories Nicolas Dichtel ` (10 preceding siblings ...) 2017-03-03 17:07 ` [PATCH v9 00/11] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-03-10 16:34 ` Nicolas Dichtel 2017-03-11 5:43 ` Masahiro Yamada 11 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-10 16:34 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, herbert, linux-rdma Le 02/03/2017 à 17:56, Nicolas Dichtel a écrit : > Patches #1 and #2 are just cleanup: some exported headers were still under > a non-uapi directory. Patch #3 is a fix to avoid exporting a file that was > not under an uapi directory. > After these three patches, all exported headers are under an uapi directory: > path #4 stops searching files in non uapi directories. > The patch #5 was spotted by code review: there is no in-tree user of this > functionality. > Patch #6 fixes some warnings/errors reported by 0-day tests. > Patch #7 to #9 fix some errors when the corresponding files are included by > userland. > Patches #10 and #11 remove the need to list explicitly headers. Now all files > under an uapi directory are exported. > > This series has been tested with a 'make headers_install' on x86 and a > 'make headers_install_all'. I've checked the result of both commands. > > This patch is built against linus tree. If I must rebase it against the kbuild > tree, just tell me. > Michal, is this series going through your tree? Still waiting to know who may take this series in its tree ;-) kbuild tree has not been updated since two months (4.10-rc1) :/ Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v9 00/11] uapi: export all headers under uapi directories 2017-03-10 16:34 ` Nicolas Dichtel @ 2017-03-11 5:43 ` Masahiro Yamada 2017-03-13 16:57 ` Nicolas Dichtel 2017-03-14 12:54 ` [PATCH v10 " Nicolas Dichtel 0 siblings, 2 replies; 554+ messages in thread From: Masahiro Yamada @ 2017-03-11 5:43 UTC (permalink / raw) To: nicolas.dichtel Cc: Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David S. Miller, Russell King, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, Ingo Molnar, Thomas Gleixner, ldv, Herbert Xu, linux-rdma Hi Nicolas, 2017-03-11 1:34 GMT+09:00 Nicolas Dichtel <nicolas.dichtel@6wind.com>: > Le 02/03/2017 à 17:56, Nicolas Dichtel a écrit : >> Patches #1 and #2 are just cleanup: some exported headers were still under >> a non-uapi directory. Patch #3 is a fix to avoid exporting a file that was >> not under an uapi directory. >> After these three patches, all exported headers are under an uapi directory: >> path #4 stops searching files in non uapi directories. >> The patch #5 was spotted by code review: there is no in-tree user of this >> functionality. >> Patch #6 fixes some warnings/errors reported by 0-day tests. >> Patch #7 to #9 fix some errors when the corresponding files are included by >> userland. >> Patches #10 and #11 remove the need to list explicitly headers. Now all files >> under an uapi directory are exported. >> >> This series has been tested with a 'make headers_install' on x86 and a >> 'make headers_install_all'. I've checked the result of both commands. >> >> This patch is built against linus tree. If I must rebase it against the kbuild >> tree, just tell me. >> Michal, is this series going through your tree? > Still waiting to know who may take this series in its tree ;-) I will take care of this. > kbuild tree has not been updated since two months (4.10-rc1) :/ Michal's tree is not active these days. Going forward, I will queue up Kbuild patches in my repository. BTW, this series does not apply cleanly. If you could rebase it onto v4.11-rc1 tag, it would be helpful. Thanks! -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v9 00/11] uapi: export all headers under uapi directories 2017-03-11 5:43 ` Masahiro Yamada @ 2017-03-13 16:57 ` Nicolas Dichtel 2017-03-14 5:38 ` Masahiro Yamada 2017-03-14 12:54 ` [PATCH v10 " Nicolas Dichtel 1 sibling, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-13 16:57 UTC (permalink / raw) To: Masahiro Yamada Cc: Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David S. Miller, Russell King, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, Ingo Molnar, Thomas Gleixner, ldv, Herbert Xu, linux-rdma Le 11/03/2017 à 06:43, Masahiro Yamada a écrit : [snip] > > I will take care of this. Thank you. > > > >> kbuild tree has not been updated since two months (4.10-rc1) :/ > > Michal's tree is not active these days. Ok, I didn't know that. > Going forward, I will queue up Kbuild patches in my repository. > > > > BTW, this series does not apply cleanly. > > If you could rebase it onto v4.11-rc1 tag, > it would be helpful. You really want this on top of 4.11-rc1 or the last linus tag, ie v4.11-rc2? Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v9 00/11] uapi: export all headers under uapi directories 2017-03-13 16:57 ` Nicolas Dichtel @ 2017-03-14 5:38 ` Masahiro Yamada 2017-03-14 8:25 ` Nicolas Dichtel 0 siblings, 1 reply; 554+ messages in thread From: Masahiro Yamada @ 2017-03-14 5:38 UTC (permalink / raw) To: Nicolas Dichtel Cc: Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David S. Miller, Russell King, bp, slash.tmp, Daniel Vetter, rmk+kernel, msalter, jengelh, hch, Tobias Klauser, mpe, Ingo Molnar, Thomas Gleixner, ldv, Herbert Xu, linux-rdma Ni Nicolas, 2017-03-14 1:57 GMT+09:00 Nicolas Dichtel <nicolas.dichtel@6wind.com>: >> BTW, this series does not apply cleanly. >> >> If you could rebase it onto v4.11-rc1 tag, >> it would be helpful. > You really want this on top of 4.11-rc1 or the last linus tag, ie v4.11-rc2? > Basically, I queue up patches based on -rc1 tag unless there is a particular reason for otherwise. If it is based on -rc1, will it cause conflicts with Linus tree? -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v9 00/11] uapi: export all headers under uapi directories 2017-03-14 5:38 ` Masahiro Yamada @ 2017-03-14 8:25 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-14 8:25 UTC (permalink / raw) To: Masahiro Yamada Cc: Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David S. Miller, Russell King, bp, slash.tmp, Daniel Vetter, rmk+kernel, msalter, jengelh, hch, Tobias Klauser, mpe, Ingo Molnar, Thomas Gleixner, ldv, Herbert Xu, linux-rdma Le 14/03/2017 à 06:38, Masahiro Yamada a écrit : > Ni Nicolas, > > > 2017-03-14 1:57 GMT+09:00 Nicolas Dichtel <nicolas.dichtel@6wind.com>: >>> BTW, this series does not apply cleanly. >>> >>> If you could rebase it onto v4.11-rc1 tag, >>> it would be helpful. >> You really want this on top of 4.11-rc1 or the last linus tag, ie v4.11-rc2? >> > > Basically, I queue up patches based on -rc1 tag > unless there is a particular reason for otherwise. Ok, thank you for the explanation. > > If it is based on -rc1, will it cause conflicts with Linus tree? I will check and let you know in the v10 submission. Thank you, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v10 00/11] uapi: export all headers under uapi directories 2017-03-11 5:43 ` Masahiro Yamada 2017-03-13 16:57 ` Nicolas Dichtel @ 2017-03-14 12:54 ` Nicolas Dichtel 2017-03-14 12:54 ` [PATCH v10 01/11] h8300: put bitsperlong.h in uapi Nicolas Dichtel ` (11 more replies) 1 sibling, 12 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-14 12:54 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma Patches #1 and #2 are just cleanup: some exported headers were still under a non-uapi directory. Patch #3 is a fix to avoid exporting a file that was not under an uapi directory. After these three patches, all exported headers are under an uapi directory: path #4 stops searching files in non uapi directories. The patch #5 was spotted by code review: there is no in-tree user of this functionality. Patch #6 fixes some warnings/errors reported by 0-day tests. Patch #7 to #9 fix some errors when the corresponding files are included by userland. Patches #10 and #11 remove the need to list explicitly headers. Now all files under an uapi directory are exported. This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built on top of masahiroy/linux-kbuild.git#for-next (v4.11-rc1). I didn't find any conflict with v4.11-rc2. v9 -> v10: - rebase on top of masahiroy/linux-kbuild.git#for-next - patch #4 & #10: fix dependency check - fix some typos in commits logs v8 -> v9: - rebase on top of linus tree - patch #8: add include/uapi/linux/crypto.h v7 -> v8: - rebase on top of linus tree - add patch #7, #8 and #9 v6 -> v7: - rebase on top of linus tree - patch #7: remove autogenerated files from the list in the commit log v5 -> v6: - patch #6: remove change of include/uapi/linux/media.h - patch #7: fix hdr export when 'make O=' is used (look for genhdr files in the right directory) - patch #8: fix 'make headers_check' v4 -> v5: - patch #3: get back to v3 (don't export msr-index.h) - patch #6: new in this version - patch #7: fix compilation by introducing header-n v3 -> v4: - first patch has been included - patch #4: get back to v2 and remove arch/x86/include/asm/msr-index.h v2 -> v3: - patch #1: remove arch/arm/include/asm/types.h - patch #2: remove arch/h8300/include/asm/bitsperlong.h - patch #3: remove arch/nios2/include/uapi/asm/setup.h - patch #4: don't export msr-index.h - patch #5: fix a typo: s/unput-files3-name/input-files3-name - patch #6: no change - patch #7: fix include/uapi/asm-generic/Kbuild.asm by introducing mandatory-y - add patch #8 v1 -> v2: - add patch #1 to #6 - patch #7: remove use of header-y Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v10 01/11] h8300: put bitsperlong.h in uapi 2017-03-14 12:54 ` [PATCH v10 " Nicolas Dichtel @ 2017-03-14 12:54 ` Nicolas Dichtel 2017-03-27 5:31 ` Masahiro Yamada 2017-03-14 12:54 ` [PATCH v10 02/11] nios2: put setup.h " Nicolas Dichtel ` (10 subsequent siblings) 11 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-14 12:54 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 14 -------------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h deleted file mode 100644 index e140e46729ac..000000000000 --- a/arch/h8300/include/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __ASM_H8300_BITS_PER_LONG -#define __ASM_H8300_BITS_PER_LONG - -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif - -#endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..e56cf72369b6 --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG +#define _UAPI_ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI_ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v10 01/11] h8300: put bitsperlong.h in uapi 2017-03-14 12:54 ` [PATCH v10 01/11] h8300: put bitsperlong.h in uapi Nicolas Dichtel @ 2017-03-27 5:31 ` Masahiro Yamada 2017-03-27 9:43 ` Nicolas Dichtel 0 siblings, 1 reply; 554+ messages in thread From: Masahiro Yamada @ 2017-03-27 5:31 UTC (permalink / raw) To: Nicolas Dichtel Cc: Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David S. Miller, Russell King, bp, slash.tmp, Daniel Vetter, rmk+kernel, msalter, jengelh, hch, Tobias Klauser, mpe, Ingo Molnar, Thomas Gleixner, Dmitry V. Levin, Herbert Xu, linux-rdma Hi Nicolas, 2017-03-14 21:54 GMT+09:00 Nicolas Dichtel <nicolas.dichtel@6wind.com>: > This header file is exported, thus move it to uapi. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > -#endif /* __ASM_H8300_BITS_PER_LONG */ > diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h > new file mode 100644 > index 000000000000..e56cf72369b6 > --- /dev/null > +++ b/arch/h8300/include/uapi/asm/bitsperlong.h > @@ -0,0 +1,14 @@ > +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG > +#define _UAPI_ASM_H8300_BITS_PER_LONG Just a minor comment. The include guard was originally __ASM_H8300_BITS_PER_LONG. This will change it into _ASM_H8300_BITS_PER_LONG (after _UAPI is stripped by headers_install.sh) I just thought _UAPI__ASM_H8300_BITS_PER_LONG might be even safer, but I know I am nit-picking. I can apply this as-is. I leave it to you. -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v10 01/11] h8300: put bitsperlong.h in uapi 2017-03-27 5:31 ` Masahiro Yamada @ 2017-03-27 9:43 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 9:43 UTC (permalink / raw) To: Masahiro Yamada Cc: Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David S. Miller, Russell King, bp, slash.tmp, Daniel Vetter, rmk+kernel, msalter, jengelh, hch, Tobias Klauser, mpe, Ingo Molnar, Thomas Gleixner, Dmitry V. Levin, Herbert Xu, linux-rdma Le 27/03/2017 à 07:31, Masahiro Yamada a écrit : [snip] >> -#endif /* __ASM_H8300_BITS_PER_LONG */ >> diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h >> new file mode 100644 >> index 000000000000..e56cf72369b6 >> --- /dev/null >> +++ b/arch/h8300/include/uapi/asm/bitsperlong.h >> @@ -0,0 +1,14 @@ >> +#ifndef _UAPI_ASM_H8300_BITS_PER_LONG >> +#define _UAPI_ASM_H8300_BITS_PER_LONG > > > Just a minor comment. > > The include guard was originally __ASM_H8300_BITS_PER_LONG. > This will change it into _ASM_H8300_BITS_PER_LONG > (after _UAPI is stripped by headers_install.sh) > > I just thought _UAPI__ASM_H8300_BITS_PER_LONG might be even safer, > but I know I am nit-picking. I can apply this as-is. > I leave it to you. I intentionnaly "clean" that, but I will restore it, no problem ;-) Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v10 02/11] nios2: put setup.h in uapi 2017-03-14 12:54 ` [PATCH v10 " Nicolas Dichtel 2017-03-14 12:54 ` [PATCH v10 01/11] h8300: put bitsperlong.h in uapi Nicolas Dichtel @ 2017-03-14 12:54 ` Nicolas Dichtel 2017-03-14 12:54 ` [PATCH v10 03/11] x86: stop exporting msr-index.h to userland Nicolas Dichtel ` (9 subsequent siblings) 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-14 12:54 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This header file is exported, but from a userland pov, it's just a wrapper to asm-generic/setup.h. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: Tobias Klauser <tklauser@distanz.ch> --- arch/nios2/include/uapi/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..69c965304146 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -2,4 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h +generic-y += setup.h generic-y += ucontext.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v10 03/11] x86: stop exporting msr-index.h to userland 2017-03-14 12:54 ` [PATCH v10 " Nicolas Dichtel 2017-03-14 12:54 ` [PATCH v10 01/11] h8300: put bitsperlong.h in uapi Nicolas Dichtel 2017-03-14 12:54 ` [PATCH v10 02/11] nios2: put setup.h " Nicolas Dichtel @ 2017-03-14 12:54 ` Nicolas Dichtel 2017-03-14 12:54 ` [PATCH v10 04/11] Makefile.headersinst: cleanup input files Nicolas Dichtel ` (8 subsequent siblings) 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-14 12:54 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma Even if this file was not in an uapi directory, it was exported because it was listed in the Kbuild file. Fixes: b72e7464e4cf ("x86/uapi: Do not export <asm/msr-index.h> as part of the user API headers") Suggested-by: Borislav Petkov <bp@alien8.de> CC: Ingo Molnar <mingo@kernel.org> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Ingo Molnar <mingo@kernel.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> --- arch/x86/include/uapi/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..1c532b3f18ea 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -27,7 +27,6 @@ header-y += ldt.h header-y += mce.h header-y += mman.h header-y += msgbuf.h -header-y += msr-index.h header-y += msr.h header-y += mtrr.h header-y += param.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v10 04/11] Makefile.headersinst: cleanup input files 2017-03-14 12:54 ` [PATCH v10 " Nicolas Dichtel ` (2 preceding siblings ...) 2017-03-14 12:54 ` [PATCH v10 03/11] x86: stop exporting msr-index.h to userland Nicolas Dichtel @ 2017-03-14 12:54 ` Nicolas Dichtel 2017-03-14 12:54 ` [PATCH v10 05/11] Makefile.headersinst: remove destination-y option Nicolas Dichtel ` (7 subsequent siblings) 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-14 12:54 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma After the last three patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that input-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..7bd9df6efe2f 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ @@ -106,7 +94,9 @@ __headersinst: $(subdirs) $(install-file) @: targets += $(install-file) -$(install-file): scripts/headers_install.sh $(input-files1) $(input-files2) $(input-files3) FORCE +$(install-file): scripts/headers_install.sh \ + $(addprefix $(srcdir)/,$(header-y)) \ + $(addprefix $(gendir)/,$(genhdr-y)) FORCE $(if $(unwanted),$(call cmd,remove),) $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@))) $(call if_changed,install) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v10 05/11] Makefile.headersinst: remove destination-y option 2017-03-14 12:54 ` [PATCH v10 " Nicolas Dichtel ` (3 preceding siblings ...) 2017-03-14 12:54 ` [PATCH v10 04/11] Makefile.headersinst: cleanup input files Nicolas Dichtel @ 2017-03-14 12:54 ` Nicolas Dichtel 2017-03-14 12:54 ` [PATCH v10 06/11] uapi: includes linux/types.h before exporting files Nicolas Dichtel ` (6 subsequent siblings) 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-14 12:54 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Paul Bolle <pebolle@tiscali.nl> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 7bd9df6efe2f..ca5d439c9abf 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v10 06/11] uapi: includes linux/types.h before exporting files 2017-03-14 12:54 ` [PATCH v10 " Nicolas Dichtel ` (4 preceding siblings ...) 2017-03-14 12:54 ` [PATCH v10 05/11] Makefile.headersinst: remove destination-y option Nicolas Dichtel @ 2017-03-14 12:54 ` Nicolas Dichtel 2017-03-14 12:54 ` [PATCH v10 07/11] btrfs_tree.h: fix include from userland Nicolas Dichtel ` (5 subsequent siblings) 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-14 12:54 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma Some files will be exported after a following patch. 0-day tests report the following warning/error: ./usr/include/linux/bcache.h:8: include of <linux/types.h> is preferred over <asm/types.h> ./usr/include/linux/bcache.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/qrtr.h:8: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/cryptouser.h:39: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/pr.h:14: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/btrfs_tree.h:337: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/rdma/bnxt_re-abi.h:45: found __[us]{8,16,32,64} type without #include <linux/types.h> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/uapi/linux/bcache.h | 2 +- include/uapi/linux/btrfs_tree.h | 2 ++ include/uapi/linux/cryptouser.h | 2 ++ include/uapi/linux/pr.h | 2 ++ include/uapi/linux/qrtr.h | 1 + include/uapi/rdma/bnxt_re-abi.h | 2 ++ 6 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h index 22b6ad31c706..e3bb0635e94a 100644 --- a/include/uapi/linux/bcache.h +++ b/include/uapi/linux/bcache.h @@ -5,7 +5,7 @@ * Bcache on disk data structures */ -#include <asm/types.h> +#include <linux/types.h> #define BITMASK(name, type, field, offset, size) \ static inline __u64 name(const type *k) \ diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h index d5ad15a106a7..6a261cb52d95 100644 --- a/include/uapi/linux/btrfs_tree.h +++ b/include/uapi/linux/btrfs_tree.h @@ -1,6 +1,8 @@ #ifndef _BTRFS_CTREE_H_ #define _BTRFS_CTREE_H_ +#include <linux/types.h> + /* * This header contains the structure definitions and constants used * by file system objects that can be retrieved using diff --git a/include/uapi/linux/cryptouser.h b/include/uapi/linux/cryptouser.h index 11d21fce14d6..c6a09c5261e7 100644 --- a/include/uapi/linux/cryptouser.h +++ b/include/uapi/linux/cryptouser.h @@ -18,6 +18,8 @@ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <linux/types.h> + /* Netlink configuration messages. */ enum { CRYPTO_MSG_BASE = 0x10, diff --git a/include/uapi/linux/pr.h b/include/uapi/linux/pr.h index 57d7c0f916b6..645ef3cf3dd0 100644 --- a/include/uapi/linux/pr.h +++ b/include/uapi/linux/pr.h @@ -1,6 +1,8 @@ #ifndef _UAPI_PR_H #define _UAPI_PR_H +#include <linux/types.h> + enum pr_type { PR_WRITE_EXCLUSIVE = 1, PR_EXCLUSIVE_ACCESS = 2, diff --git a/include/uapi/linux/qrtr.h b/include/uapi/linux/qrtr.h index 66c0748d26e2..b14ee91ec387 100644 --- a/include/uapi/linux/qrtr.h +++ b/include/uapi/linux/qrtr.h @@ -1,6 +1,7 @@ #ifndef _LINUX_QRTR_H #define _LINUX_QRTR_H +#include <linux/types.h> #include <linux/socket.h> struct sockaddr_qrtr { diff --git a/include/uapi/rdma/bnxt_re-abi.h b/include/uapi/rdma/bnxt_re-abi.h index e2c8a3f0ccec..74018bd18d72 100644 --- a/include/uapi/rdma/bnxt_re-abi.h +++ b/include/uapi/rdma/bnxt_re-abi.h @@ -39,6 +39,8 @@ #ifndef __BNXT_RE_UVERBS_ABI_H__ #define __BNXT_RE_UVERBS_ABI_H__ +#include <linux/types.h> + #define BNXT_RE_ABI_VERSION 1 struct bnxt_re_uctx_resp { -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v10 07/11] btrfs_tree.h: fix include from userland 2017-03-14 12:54 ` [PATCH v10 " Nicolas Dichtel ` (5 preceding siblings ...) 2017-03-14 12:54 ` [PATCH v10 06/11] uapi: includes linux/types.h before exporting files Nicolas Dichtel @ 2017-03-14 12:54 ` Nicolas Dichtel 2017-03-27 5:53 ` Masahiro Yamada 2017-03-14 12:54 ` [PATCH v10 08/11] cryptouser.h: " Nicolas Dichtel ` (4 subsequent siblings) 11 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-14 12:54 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This patch prepares the uapi export by fixing the following errors: .../linux/btrfs_tree.h:283:2: error: #error "UUID items require BTRFS_UUID_SIZE == 16!" #error "UUID items require BTRFS_UUID_SIZE == 16!" .../linux/btrfs_tree.h:390:12: error: ‘BTRFS_UUID_SIZE’ undeclared here (not in a function) __u8 uuid[BTRFS_UUID_SIZE]; ^ .../linux/btrfs_tree.h:796:16: error: ‘BTRFS_DEV_STAT_VALUES_MAX’ undeclared here (not in a function) __le64 values[BTRFS_DEV_STAT_VALUES_MAX]; Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/uapi/linux/btrfs_tree.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h index 6a261cb52d95..6a754ada59af 100644 --- a/include/uapi/linux/btrfs_tree.h +++ b/include/uapi/linux/btrfs_tree.h @@ -2,6 +2,7 @@ #define _BTRFS_CTREE_H_ #include <linux/types.h> +#include <linux/btrfs.h> /* * This header contains the structure definitions and constants used -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v10 07/11] btrfs_tree.h: fix include from userland 2017-03-14 12:54 ` [PATCH v10 07/11] btrfs_tree.h: fix include from userland Nicolas Dichtel @ 2017-03-27 5:53 ` Masahiro Yamada 2017-03-27 9:45 ` Nicolas Dichtel 0 siblings, 1 reply; 554+ messages in thread From: Masahiro Yamada @ 2017-03-27 5:53 UTC (permalink / raw) To: Nicolas Dichtel Cc: Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David S. Miller, Russell King, bp, slash.tmp, Daniel Vetter, rmk+kernel, msalter, jengelh, hch, Tobias Klauser, mpe, Ingo Molnar, Thomas Gleixner, Dmitry V. Levin, Herbert Xu, linux-rdma Hi Nicolas, 2017-03-14 21:54 GMT+09:00 Nicolas Dichtel <nicolas.dichtel@6wind.com>: > This patch prepares the uapi export by fixing the following errors: > > .../linux/btrfs_tree.h:283:2: error: #error "UUID items require BTRFS_UUID_SIZE == 16!" > #error "UUID items require BTRFS_UUID_SIZE == 16!" > > .../linux/btrfs_tree.h:390:12: error: ‘BTRFS_UUID_SIZE’ undeclared here (not in a function) > __u8 uuid[BTRFS_UUID_SIZE]; > ^ > .../linux/btrfs_tree.h:796:16: error: ‘BTRFS_DEV_STAT_VALUES_MAX’ undeclared here (not in a function) > __le64 values[BTRFS_DEV_STAT_VALUES_MAX]; > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > include/uapi/linux/btrfs_tree.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h > index 6a261cb52d95..6a754ada59af 100644 > --- a/include/uapi/linux/btrfs_tree.h > +++ b/include/uapi/linux/btrfs_tree.h > @@ -2,6 +2,7 @@ > #define _BTRFS_CTREE_H_ > > #include <linux/types.h> > +#include <linux/btrfs.h> > Can you move <linux/types.h> below <linux/btrfs.h> to sort the includes alphabetically? This also applies to: include/uapi/linux/qrtr.h in 06/11 include/uapi/linux/cryptouser.h in 08/11 -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v10 07/11] btrfs_tree.h: fix include from userland 2017-03-27 5:53 ` Masahiro Yamada @ 2017-03-27 9:45 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 9:45 UTC (permalink / raw) To: Masahiro Yamada Cc: Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David S. Miller, Russell King, bp, slash.tmp, Daniel Vetter, rmk+kernel, msalter, jengelh, hch, Tobias Klauser, mpe, Ingo Molnar, Thomas Gleixner, Dmitry V. Levin, Herbert Xu, linux-rdma Hi Masahiro, Le 27/03/2017 à 07:53, Masahiro Yamada a écrit : > Hi Nicolas, > > > 2017-03-14 21:54 GMT+09:00 Nicolas Dichtel <nicolas.dichtel@6wind.com>: [snip] >> diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h >> index 6a261cb52d95..6a754ada59af 100644 >> --- a/include/uapi/linux/btrfs_tree.h >> +++ b/include/uapi/linux/btrfs_tree.h >> @@ -2,6 +2,7 @@ >> #define _BTRFS_CTREE_H_ >> >> #include <linux/types.h> >> +#include <linux/btrfs.h> >> > > Can you move <linux/types.h> below <linux/btrfs.h> > to sort the includes alphabetically? Ok. > > This also applies to: > > include/uapi/linux/qrtr.h in 06/11 > include/uapi/linux/cryptouser.h in 08/11 Ok. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v10 08/11] cryptouser.h: fix include from userland 2017-03-14 12:54 ` [PATCH v10 " Nicolas Dichtel ` (6 preceding siblings ...) 2017-03-14 12:54 ` [PATCH v10 07/11] btrfs_tree.h: fix include from userland Nicolas Dichtel @ 2017-03-14 12:54 ` Nicolas Dichtel 2017-03-14 12:54 ` [PATCH v10 09/11] smc_diag.h: " Nicolas Dichtel ` (3 subsequent siblings) 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-14 12:54 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This patch prepares the uapi export by fixing the following error: .../linux/cryptouser.h:58:16: error: ‘CRYPTO_MAX_ALG_NAME’ undeclared here (not in a function) char cru_name[CRYPTO_MAX_ALG_NAME]; Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> --- include/linux/crypto.h | 2 +- include/uapi/linux/crypto.h | 14 ++++++++++++++ include/uapi/linux/cryptouser.h | 6 ++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 include/uapi/linux/crypto.h diff --git a/include/linux/crypto.h b/include/linux/crypto.h index c0b0cf3d2d2f..cc2425ba8527 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -24,6 +24,7 @@ #include <linux/slab.h> #include <linux/string.h> #include <linux/uaccess.h> +#include <uapi/linux/crypto.h> /* * Autoloaded crypto modules should only use a prefixed name to avoid allowing @@ -123,7 +124,6 @@ /* * Miscellaneous stuff. */ -#define CRYPTO_MAX_ALG_NAME 64 /* * The macro CRYPTO_MINALIGN_ATTR (along with the void * type in the actual diff --git a/include/uapi/linux/crypto.h b/include/uapi/linux/crypto.h new file mode 100644 index 000000000000..e342c5a5ac50 --- /dev/null +++ b/include/uapi/linux/crypto.h @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2017 Nicolas Dichtel <nicolas.dichtel@6wind.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + */ + +#ifndef _UAPI_CRYPTO_H +#define _UAPI_CRYPTO_H + +#define CRYPTO_MAX_ALG_NAME 64 + +#endif /* _UAPI_CRYPTO_H */ diff --git a/include/uapi/linux/cryptouser.h b/include/uapi/linux/cryptouser.h index c6a09c5261e7..ce3c64fb89e1 100644 --- a/include/uapi/linux/cryptouser.h +++ b/include/uapi/linux/cryptouser.h @@ -18,7 +18,11 @@ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef _UAPI_CRYPTOUSER_H +#define _UAPI_CRYPTOUSER_H + #include <linux/types.h> +#include <linux/crypto.h> /* Netlink configuration messages. */ enum { @@ -121,3 +125,5 @@ struct crypto_report_acomp { #define CRYPTO_REPORT_MAXSIZE (sizeof(struct crypto_user_alg) + \ sizeof(struct crypto_report_blkcipher)) + +#endif /* _UAPI_CRYPTOUSER_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v10 09/11] smc_diag.h: fix include from userland 2017-03-14 12:54 ` [PATCH v10 " Nicolas Dichtel ` (7 preceding siblings ...) 2017-03-14 12:54 ` [PATCH v10 08/11] cryptouser.h: " Nicolas Dichtel @ 2017-03-14 12:54 ` Nicolas Dichtel 2017-03-14 12:54 ` [PATCH v10 10/11] uapi: export all headers under uapi directories Nicolas Dichtel ` (2 subsequent siblings) 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-14 12:54 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This patch prepares the uapi export by fixing the following error: .../linux/smc_diag.h:6:27: fatal error: rdma/ib_verbs.h: No such file or directory #include <rdma/ib_verbs.h> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/rdma/ib_verbs.h | 3 +-- include/uapi/linux/smc_diag.h | 2 +- include/uapi/rdma/ib_user_verbs.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 0f1813c13687..50f276a4afdc 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -61,6 +61,7 @@ #include <linux/mmu_notifier.h> #include <linux/uaccess.h> #include <linux/cgroup_rdma.h> +#include <uapi/rdma/ib_user_verbs.h> extern struct workqueue_struct *ib_wq; extern struct workqueue_struct *ib_comp_wq; @@ -1838,8 +1839,6 @@ enum ib_mad_result { IB_MAD_RESULT_CONSUMED = 1 << 2 /* Packet consumed: stop processing */ }; -#define IB_DEVICE_NAME_MAX 64 - struct ib_port_cache { struct ib_pkey_cache *pkey; struct ib_gid_table *gid; diff --git a/include/uapi/linux/smc_diag.h b/include/uapi/linux/smc_diag.h index 0063919fea34..87712bfaa9dd 100644 --- a/include/uapi/linux/smc_diag.h +++ b/include/uapi/linux/smc_diag.h @@ -3,7 +3,7 @@ #include <linux/types.h> #include <linux/inet_diag.h> -#include <rdma/ib_verbs.h> +#include <rdma/ib_user_verbs.h> /* Request structure */ struct smc_diag_req { diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h index 997f904c7692..8edce2b65903 100644 --- a/include/uapi/rdma/ib_user_verbs.h +++ b/include/uapi/rdma/ib_user_verbs.h @@ -1124,4 +1124,6 @@ struct ib_uverbs_ex_destroy_rwq_ind_table { __u32 ind_tbl_handle; }; +#define IB_DEVICE_NAME_MAX 64 + #endif /* IB_USER_VERBS_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v10 10/11] uapi: export all headers under uapi directories 2017-03-14 12:54 ` [PATCH v10 " Nicolas Dichtel ` (8 preceding siblings ...) 2017-03-14 12:54 ` [PATCH v10 09/11] smc_diag.h: " Nicolas Dichtel @ 2017-03-14 12:54 ` Nicolas Dichtel 2017-03-14 12:54 ` [PATCH v10 11/11] uapi: export all arch specifics directories Nicolas Dichtel 2017-03-24 8:32 ` [PATCH v10 00/11] uapi: export all headers under uapi directories Nicolas Dichtel 11 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-14 12:54 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-arc/kvm_para.h asm-arc/ucontext.h asm-avr32/kvm_para.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-c6x/shmparam.h asm-c6x/ucontext.h asm-cris/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-hexagon/shmparam.h asm-m32r/kvm_para.h asm-m68k/kvm_para.h asm-m68k/shmparam.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-mips/hwcap.h asm-mips/reg.h asm-mips/ucontext.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-openrisc/shmparam.h asm-parisc/kvm_para.h asm-powerpc/perf_regs.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-tile/shmparam.h asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-x86/hwcap2.h asm-xtensa/kvm_para.h drm/armada_drm.h drm/etnaviv_drm.h drm/vgem_drm.h linux/auto_dev-ioctl.h linux/bcache.h linux/btrfs_tree.h linux/cifs/cifs_mount.h linux/coresight-stm.h linux/crypto.h linux/cryptouser.h linux/genwqe/genwqe_card.h linux/hash_info.h linux/kcm.h linux/kcov.h linux/kfd_ioctl.h linux/lightnvm.h linux/module.h linux/nilfs2_api.h linux/nilfs2_ondisk.h linux/nsfs.h linux/pr.h linux/qrtr.h linux/rpmsg.h linux/sched/types.h linux/sed-opal.h linux/smc.h linux/smc_diag.h linux/stm.h linux/userio.h linux/virtio_mmio.h linux/wil6210_uapi.h rdma/bnxt_re-abi.h Note that I have removed from this list the files which are generated in every exported directories (like .install or .install.cmd). Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. For the record, note that exported files for asm directories are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/<arch>/include/uapi/asm/Kbuild; - arch/<arch>/include/asm/Kbuild. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Mark Salter <msalter@redhat.com> Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) --- Documentation/kbuild/makefiles.txt | 66 ++-- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 - arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 3 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 53 --- arch/score/include/asm/Kbuild | 3 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 58 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 -- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 23 -- include/uapi/linux/Kbuild | 494 +--------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 - include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 16 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 20 -- include/uapi/rdma/hfi/Kbuild | 3 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 55 ++-- 81 files changed, 115 insertions(+), 1759 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..91ffb391ed54 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,10 +44,12 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 header-n --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y + --- 7.5 mandatory-y + --- 7.6 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1235,7 +1237,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1264,30 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. -See subsequent chapter for the syntax of the Kbuild file. - - --- 7.1 header-y - - header-y specifies header files to be exported. - - Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. - The convention is to list one file per line and - preferably in alphabetic order. +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. +See subsequent chapter for the syntax of the Kbuild file. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. + --- 7.1 header-n - Subdirectories are visited before their parent directories. + header-n is essentially used by include/uapi/linux/Kbuild to avoid + exporting specific headers (e.g. kvm.h) on architectures that do not + support it. It should be avoided as much as possible. --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y @@ -1334,6 +1329,27 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h + --- 7.5 mandatory-y + + mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm + to define the minimun set of headers that must be exported in + include/asm. + + The convention is to list one subdir per line and + preferably in alphabetic order. + + --- 7.6 subdir-y + + subdir-y may be used to specify a subdirectory to be exported. + + Example: + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ + + The convention is to list one subdir per line and + preferably in alphabetic order. + === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index 797b64a4b80b..65f48073f8ac 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 69c965304146..374bd123329f 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,6 +1,5 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h - generic-y += setup.h generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index fb01873a5aad..1b533a107f19 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bitsperlong.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index 6848ba5c1454..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,55 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += pkey.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index 926943a49ea5..4ee7fc77d23c 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += - generic-y += barrier.h generic-y += clkdev.h generic-y += current.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index aa48b6eaff2d..61157a7e8532 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 1c532b3f18ea..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,61 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..8e6b335664f2 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +mandatory-y += auxvec.h +mandatory-y += bitsperlong.h +mandatory-y += byteorder.h +mandatory-y += errno.h +mandatory-y += fcntl.h +mandatory-y += ioctl.h +mandatory-y += ioctls.h +mandatory-y += ipcbuf.h +mandatory-y += mman.h +mandatory-y += msgbuf.h +mandatory-y += param.h +mandatory-y += poll.h +mandatory-y += posix_types.h +mandatory-y += ptrace.h +mandatory-y += resource.h +mandatory-y += sembuf.h +mandatory-y += setup.h +mandatory-y += shmbuf.h +mandatory-y += sigcontext.h +mandatory-y += siginfo.h +mandatory-y += signal.h +mandatory-y += socket.h +mandatory-y += sockios.h +mandatory-y += stat.h +mandatory-y += statfs.h +mandatory-y += swab.h +mandatory-y += termbits.h +mandatory-y += termios.h +mandatory-y += types.h +mandatory-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +mandatory-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index c97addd08f8c..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,23 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += omap_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index dd9820b1c779..456cbe8a2aad 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -1,492 +1,16 @@ # UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) +header-n += a.out.h endif -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += batman_adv.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dma-buf.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += ife.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) +header-n += kvm.h endif - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) +header-n += kvm_para.h endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += psample.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += seg6_genl.h -header-y += seg6.h -header-y += seg6_hmac.h -header-y += seg6_iptunnel.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += timerfd.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_mmio.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index ba62ddf0e58a..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_sample.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 1e0af1ff75c3..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,20 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += rdma_user_ioctl.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h -header-y += qedr-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index b65b0b3a5f63..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h -header-y += hfi1_ioctl.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index ca5d439c9abf..6e56155579d8 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,19 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +27,15 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +srcdir := $(srctree)/$(obj) +gendir := $(objtree)/$(gen) +subdirs := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srcdir)/*.h)) +header-files += $(notdir $(wildcard $(srcdir)/*.agh)) +header-files := $(filter-out $(header-n), $(header-files)) +genhdr-files := $(notdir $(wildcard $(gendir)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,25 +43,20 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) - -srcdir := $(srctree)/$(obj) -gendir := $(objtree)/$(gen) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) +ifneq ($(mandatory-y),) +missing := $(filter-out $(all-files),$(mandatory-y)) +ifneq ($(missing),) +$(error Some mandatory headers ($(missing)) are missing in $(obj)) +endif +endif # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -67,8 +70,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ @@ -95,8 +98,8 @@ __headersinst: $(subdirs) $(install-file) targets += $(install-file) $(install-file): scripts/headers_install.sh \ - $(addprefix $(srcdir)/,$(header-y)) \ - $(addprefix $(gendir)/,$(genhdr-y)) FORCE + $(addprefix $(srcdir)/,$(header-files)) \ + $(addprefix $(gendir)/,$(genhdr-files)) FORCE $(if $(unwanted),$(call cmd,remove),) $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@))) $(call if_changed,install) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v10 11/11] uapi: export all arch specifics directories 2017-03-14 12:54 ` [PATCH v10 " Nicolas Dichtel ` (9 preceding siblings ...) 2017-03-14 12:54 ` [PATCH v10 10/11] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-03-14 12:54 ` Nicolas Dichtel 2017-03-27 5:27 ` Masahiro Yamada 2017-03-24 8:32 ` [PATCH v10 00/11] uapi: export all headers under uapi directories Nicolas Dichtel 11 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-14 12:54 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This patch removes the need of subdir-y. Now all files/directories under arch/<arch>/include/uapi/ are exported. The only change for userland is the layout of the command 'make headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. Those new directories contains all files/directories of the specified arch. Note that only cris and tile have more directories than only asm: - arch-v[10|32] for cris; - arch for tile. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 15 +-------------- Makefile | 6 +++--- arch/cris/include/uapi/asm/Kbuild | 3 --- arch/tile/include/uapi/asm/Kbuild | 2 -- scripts/Makefile.headersinst | 3 +-- 5 files changed, 5 insertions(+), 24 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 91ffb391ed54..223b33d5195a 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -49,7 +49,6 @@ This document describes the Linux kernel Makefiles. --- 7.3 generic-y --- 7.4 generated-y --- 7.5 mandatory-y - --- 7.6 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1265,7 +1264,7 @@ The pre-processing does: - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) All headers under include/uapi/, include/generated/uapi/, -arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/ are exported. A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and @@ -1338,18 +1337,6 @@ See subsequent chapter for the syntax of the Kbuild file. The convention is to list one subdir per line and preferably in alphabetic order. - --- 7.6 subdir-y - - subdir-y may be used to specify a subdirectory to be exported. - - Example: - #arch/cris/include/uapi/asm/Kbuild - subdir-y += ../arch-v10/arch/ - subdir-y += ../arch-v32/arch/ - - The convention is to list one subdir per line and - preferably in alphabetic order. - === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/Makefile b/Makefile index 165cf9783a5d..954b20072c42 100644 --- a/Makefile +++ b/Makefile @@ -1128,7 +1128,7 @@ firmware_install: export INSTALL_HDR_PATH = $(objtree)/usr # If we do an all arch process set dst to asm-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) PHONY += archheaders archheaders: @@ -1149,7 +1149,7 @@ headers_install: __headers $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all @@ -1158,7 +1158,7 @@ headers_check_all: headers_install_all PHONY += headers_check headers_check: headers_install $(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1 - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1 + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/ $(hdr-dst) HDRCHECK=1 # --------------------------------------------------------------------------- # Kernel selftest diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d0c5471856e0..b15bf6bc0e94 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -subdir-y += ../arch-v10/arch/ -subdir-y += ../arch-v32/arch/ diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index e0a50111e07f..0c74c3c5ebfa 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -2,5 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ucontext.h - -subdir-y += ../arch diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 6e56155579d8..3d692b650687 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -2,7 +2,7 @@ # Installing headers # # All headers under include/uapi, include/generated/uapi, -# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are # exported. # They are preprocessed to remove __KERNEL__ section of the file. # @@ -30,7 +30,6 @@ installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) subdirs := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/*/.)) -subdirs += $(subdir-y) header-files := $(notdir $(wildcard $(srcdir)/*.h)) header-files += $(notdir $(wildcard $(srcdir)/*.agh)) header-files := $(filter-out $(header-n), $(header-files)) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v10 11/11] uapi: export all arch specifics directories 2017-03-14 12:54 ` [PATCH v10 11/11] uapi: export all arch specifics directories Nicolas Dichtel @ 2017-03-27 5:27 ` Masahiro Yamada 2017-03-27 9:42 ` Nicolas Dichtel 0 siblings, 1 reply; 554+ messages in thread From: Masahiro Yamada @ 2017-03-27 5:27 UTC (permalink / raw) To: Nicolas Dichtel Cc: Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David S. Miller, Russell King, bp, slash.tmp, Daniel Vetter, rmk+kernel, msalter, jengelh, hch, Tobias Klauser, mpe, Ingo Molnar, Thomas Gleixner, Dmitry V. Levin, Herbert Xu, linux-rdma Hi Nicolas, 2017-03-14 21:54 GMT+09:00 Nicolas Dichtel <nicolas.dichtel@6wind.com>: > diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild > index d0c5471856e0..b15bf6bc0e94 100644 > --- a/arch/cris/include/uapi/asm/Kbuild > +++ b/arch/cris/include/uapi/asm/Kbuild > @@ -1,5 +1,2 @@ > # UAPI Header export list > include include/uapi/asm-generic/Kbuild.asm > - > -subdir-y += ../arch-v10/arch/ > -subdir-y += ../arch-v32/arch/ Can you remove arch/cris/include/arch-v32/arch/Kbuild arch/cris/include/arch-v10/arch/Kbuild as well? Or, not sure if they are still needed? > diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild > index e0a50111e07f..0c74c3c5ebfa 100644 > --- a/arch/tile/include/uapi/asm/Kbuild > +++ b/arch/tile/include/uapi/asm/Kbuild > @@ -2,5 +2,3 @@ > include include/uapi/asm-generic/Kbuild.asm > > generic-y += ucontext.h > - > -subdir-y += ../arch Can you remove arch/tile/include/arch/Kbuild as well? -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v10 11/11] uapi: export all arch specifics directories 2017-03-27 5:27 ` Masahiro Yamada @ 2017-03-27 9:42 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 9:42 UTC (permalink / raw) To: Masahiro Yamada Cc: Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David S. Miller, Russell King, bp, slash.tmp, Daniel Vetter, rmk+kernel, msalter, jengelh, hch, Tobias Klauser, mpe, Ingo Molnar, Thomas Gleixner, Dmitry V. Levin, Herbert Xu, linux-rdma Hi Masahiro, Le 27/03/2017 à 07:27, Masahiro Yamada a écrit : > Hi Nicolas, > > > 2017-03-14 21:54 GMT+09:00 Nicolas Dichtel <nicolas.dichtel@6wind.com>: >> diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild >> index d0c5471856e0..b15bf6bc0e94 100644 >> --- a/arch/cris/include/uapi/asm/Kbuild >> +++ b/arch/cris/include/uapi/asm/Kbuild >> @@ -1,5 +1,2 @@ >> # UAPI Header export list >> include include/uapi/asm-generic/Kbuild.asm >> - >> -subdir-y += ../arch-v10/arch/ >> -subdir-y += ../arch-v32/arch/ > > > Can you remove > arch/cris/include/arch-v32/arch/Kbuild > arch/cris/include/arch-v10/arch/Kbuild > as well? Ok. > > Or, not sure if they are still needed? I don't think so. Have a look to 77c8006d8df4 ("UAPI: Fix up empty files in arch/cris/") for more details. > > > >> diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild >> index e0a50111e07f..0c74c3c5ebfa 100644 >> --- a/arch/tile/include/uapi/asm/Kbuild >> +++ b/arch/tile/include/uapi/asm/Kbuild >> @@ -2,5 +2,3 @@ >> include include/uapi/asm-generic/Kbuild.asm >> >> generic-y += ucontext.h >> - >> -subdir-y += ../arch > > Can you remove arch/tile/include/arch/Kbuild as well? Ok. Because this removal is not directly related to this patch, I will add another patch in the series. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v10 00/11] uapi: export all headers under uapi directories 2017-03-14 12:54 ` [PATCH v10 " Nicolas Dichtel ` (10 preceding siblings ...) 2017-03-14 12:54 ` [PATCH v10 11/11] uapi: export all arch specifics directories Nicolas Dichtel @ 2017-03-24 8:32 ` Nicolas Dichtel 2017-03-24 8:42 ` Masahiro Yamada 11 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-24 8:32 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, herbert, linux-rdma Le 14/03/2017 à 13:54, Nicolas Dichtel a écrit : > Patches #1 and #2 are just cleanup: some exported headers were still under > a non-uapi directory. Patch #3 is a fix to avoid exporting a file that was > not under an uapi directory. > After these three patches, all exported headers are under an uapi directory: > path #4 stops searching files in non uapi directories. > The patch #5 was spotted by code review: there is no in-tree user of this > functionality. > Patch #6 fixes some warnings/errors reported by 0-day tests. > Patch #7 to #9 fix some errors when the corresponding files are included by > userland. > Patches #10 and #11 remove the need to list explicitly headers. Now all files > under an uapi directory are exported. > > This series has been tested with a 'make headers_install' on x86 and a > 'make headers_install_all'. I've checked the result of both commands. > > This patch is built on top of masahiroy/linux-kbuild.git#for-next (v4.11-rc1). > I didn't find any conflict with v4.11-rc2. Masahiro, is this series under review or do you expect something else on my side? Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v10 00/11] uapi: export all headers under uapi directories 2017-03-24 8:32 ` [PATCH v10 00/11] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-03-24 8:42 ` Masahiro Yamada 2017-03-24 9:03 ` Nicolas Dichtel 2017-03-27 12:20 ` [PATCH v11 00/12] " Nicolas Dichtel 0 siblings, 2 replies; 554+ messages in thread From: Masahiro Yamada @ 2017-03-24 8:42 UTC (permalink / raw) To: Nicolas Dichtel Cc: Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David S. Miller, Russell King, bp, slash.tmp, Daniel Vetter, rmk+kernel, msalter, jengelh, hch, Tobias Klauser, mpe, Ingo Molnar, Thomas Gleixner, Dmitry V. Levin, Herbert Xu, linux-rdma Hi Nicolas, 2017-03-24 17:32 GMT+09:00 Nicolas Dichtel <nicolas.dichtel@6wind.com>: > Le 14/03/2017 à 13:54, Nicolas Dichtel a écrit : >> Patches #1 and #2 are just cleanup: some exported headers were still under >> a non-uapi directory. Patch #3 is a fix to avoid exporting a file that was >> not under an uapi directory. >> After these three patches, all exported headers are under an uapi directory: >> path #4 stops searching files in non uapi directories. >> The patch #5 was spotted by code review: there is no in-tree user of this >> functionality. >> Patch #6 fixes some warnings/errors reported by 0-day tests. >> Patch #7 to #9 fix some errors when the corresponding files are included by >> userland. >> Patches #10 and #11 remove the need to list explicitly headers. Now all files >> under an uapi directory are exported. >> >> This series has been tested with a 'make headers_install' on x86 and a >> 'make headers_install_all'. I've checked the result of both commands. >> >> This patch is built on top of masahiroy/linux-kbuild.git#for-next (v4.11-rc1). >> I didn't find any conflict with v4.11-rc2. > Masahiro, is this series under review or do you expect something else on my side? > Under review. Please give me time to take a closer look. Sorry for the delay. -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v10 00/11] uapi: export all headers under uapi directories 2017-03-24 8:42 ` Masahiro Yamada @ 2017-03-24 9:03 ` Nicolas Dichtel 2017-03-27 5:26 ` Masahiro Yamada 2017-03-27 12:20 ` [PATCH v11 00/12] " Nicolas Dichtel 1 sibling, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-24 9:03 UTC (permalink / raw) To: Masahiro Yamada Cc: Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David S. Miller, Russell King, bp, slash.tmp, Daniel Vetter, rmk+kernel, msalter, jengelh, hch, Tobias Klauser, mpe, Ingo Molnar, Thomas Gleixner, Dmitry V. Levin, Herbert Xu, linux-rdma Le 24/03/2017 à 09:42, Masahiro Yamada a écrit : > Hi Nicolas, > > > 2017-03-24 17:32 GMT+09:00 Nicolas Dichtel <nicolas.dichtel@6wind.com>: >> Le 14/03/2017 à 13:54, Nicolas Dichtel a écrit : >>> Patches #1 and #2 are just cleanup: some exported headers were still under >>> a non-uapi directory. Patch #3 is a fix to avoid exporting a file that was >>> not under an uapi directory. >>> After these three patches, all exported headers are under an uapi directory: >>> path #4 stops searching files in non uapi directories. >>> The patch #5 was spotted by code review: there is no in-tree user of this >>> functionality. >>> Patch #6 fixes some warnings/errors reported by 0-day tests. >>> Patch #7 to #9 fix some errors when the corresponding files are included by >>> userland. >>> Patches #10 and #11 remove the need to list explicitly headers. Now all files >>> under an uapi directory are exported. >>> >>> This series has been tested with a 'make headers_install' on x86 and a >>> 'make headers_install_all'. I've checked the result of both commands. >>> >>> This patch is built on top of masahiroy/linux-kbuild.git#for-next (v4.11-rc1). >>> I didn't find any conflict with v4.11-rc2. >> Masahiro, is this series under review or do you expect something else on my side? >> > > Under review. > Please give me time to take a closer look. > Sorry for the delay. No problem, take your time. I just wanted to be sure to not miss something ;-) Thank you, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v10 00/11] uapi: export all headers under uapi directories 2017-03-24 9:03 ` Nicolas Dichtel @ 2017-03-27 5:26 ` Masahiro Yamada 2017-03-27 9:45 ` Nicolas Dichtel 0 siblings, 1 reply; 554+ messages in thread From: Masahiro Yamada @ 2017-03-27 5:26 UTC (permalink / raw) To: Nicolas Dichtel Cc: Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David S. Miller, Russell King, bp, slash.tmp, Daniel Vetter, rmk+kernel, msalter, jengelh, hch, Tobias Klauser, mpe, Ingo Molnar, Thomas Gleixner, Dmitry V. Levin, Herbert Xu, linux-rdma Hi Nocolas, 2017-03-24 18:03 GMT+09:00 Nicolas Dichtel <nicolas.dichtel@6wind.com>: > Le 24/03/2017 à 09:42, Masahiro Yamada a écrit : >> Hi Nicolas, >> >> >> 2017-03-24 17:32 GMT+09:00 Nicolas Dichtel <nicolas.dichtel@6wind.com>: >>> Le 14/03/2017 à 13:54, Nicolas Dichtel a écrit : >>>> Patches #1 and #2 are just cleanup: some exported headers were still under >>>> a non-uapi directory. Patch #3 is a fix to avoid exporting a file that was >>>> not under an uapi directory. >>>> After these three patches, all exported headers are under an uapi directory: >>>> path #4 stops searching files in non uapi directories. >>>> The patch #5 was spotted by code review: there is no in-tree user of this >>>> functionality. >>>> Patch #6 fixes some warnings/errors reported by 0-day tests. >>>> Patch #7 to #9 fix some errors when the corresponding files are included by >>>> userland. >>>> Patches #10 and #11 remove the need to list explicitly headers. Now all files >>>> under an uapi directory are exported. >>>> >>>> This series has been tested with a 'make headers_install' on x86 and a >>>> 'make headers_install_all'. I've checked the result of both commands. >>>> >>>> This patch is built on top of masahiroy/linux-kbuild.git#for-next (v4.11-rc1). >>>> I didn't find any conflict with v4.11-rc2. >>> Masahiro, is this series under review or do you expect something else on my side? >>> >> >> Under review. >> Please give me time to take a closer look. >> Sorry for the delay. > No problem, take your time. I just wanted to be sure to not miss something ;-) > > As a whole, this series is amazing. Thanks for your great work! I added some comments, but they are trivial. I wanted to leave comments/questions on 10/11, but I could not find 10/11 in my mailbox. I do not know why. I am leaving comments on the cover-letter, the following are related to 10/11. [1] >mandatory-y += $(foreach hdr,$(opt-header), \ > $(if \ > $(wildcard \ > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ > $(srctree)/arch/$(SRCARCH)/include/asm/$(hdr) \ > ), \ > $(hdr) \ > )) What is this actually checking? If ARCH has its own (uapi/)asm/{kvm.h,kvm_para.h,a.out.h}, they are added to mandatory-y, then they are checked if they exist. But, we know they exist. This check reminds us only when we added asm/*.h but forgot to add uapi/asm/*.h $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) seems unneeded at least. (perhaps, the whole hunk might be unneeded.) [2] >ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ > $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) >header-n += a.out.h >endif > >ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ > $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) >header-n += kvm.h >endif > >ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ > $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) >header-n += kvm_para.h >endif This series intends all headers are exported from uapi/, correct? Do we still need to check $(srctree)/arch/$(SRCARCH)/include/asm/*.h ? (related to [1]) [3] >--- 7.1 header-n > >header-n is essentially used by include/uapi/linux/Kbuild to avoid >exporting specific headers (e.g. kvm.h) on architectures that do not >support it. It should be avoided as much as possible. Going forward, header-y will be never used because uapi/ is exported by default. So, I wonder if we could rename this into something clearer. Kbuild supports "no-clean-files". (Please see ./Kbuild for its usage) I guess this notation seems clearer when we want to negate the default behavior. Can you consider "no-export", "no-export-files", "no-export-headers" or whatever you like? Thanks! -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v10 00/11] uapi: export all headers under uapi directories 2017-03-27 5:26 ` Masahiro Yamada @ 2017-03-27 9:45 ` Nicolas Dichtel 2017-03-27 15:33 ` Masahiro Yamada 0 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 9:45 UTC (permalink / raw) To: Masahiro Yamada Cc: Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David S. Miller, Russell King, bp, slash.tmp, Daniel Vetter, rmk+kernel, msalter, jengelh, hch, Tobias Klauser, mpe, Ingo Molnar, Thomas Gleixner, Dmitry V. Levin, Herbert Xu, linux-rdma Hi Masahiro, Le 27/03/2017 à 07:26, Masahiro Yamada a écrit : > Hi Nocolas, > > > 2017-03-24 18:03 GMT+09:00 Nicolas Dichtel <nicolas.dichtel@6wind.com>: [snip] > > > As a whole, this series is amazing. Thanks for your great work! Thank you. And thank you for taking time to review it. > > > I added some comments, but they are trivial. > > > > > I wanted to leave comments/questions on 10/11, > but I could not find 10/11 in my mailbox. I do not know why. Note that you can download the mail from the kbuild patchwork, open it with your email client and do a reply ;-) > > > I am leaving comments on the cover-letter, > the following are related to 10/11. > > > > [1] > >> mandatory-y += $(foreach hdr,$(opt-header), \ >> $(if \ >> $(wildcard \ >> $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ >> $(srctree)/arch/$(SRCARCH)/include/asm/$(hdr) \ >> ), \ >> $(hdr) \ >> )) > > What is this actually checking? > > If ARCH has its own (uapi/)asm/{kvm.h,kvm_para.h,a.out.h}, > they are added to mandatory-y, then they are checked if they exist. > But, we know they exist. Yes, you're right. With english words : 'those files are mandatory only if they exist', thus they are not mandatory at all :) > > > This check reminds us only when we added asm/*.h > but forgot to add uapi/asm/*.h > > $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) seems unneeded at least. > (perhaps, the whole hunk might be unneeded.) I think we can remove the whole hunk (see also [2]). > > > > [2] > >> ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ >> $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) >> header-n += a.out.h >> endif >> >> ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ >> $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) >> header-n += kvm.h >> endif >> >> ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ >> $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) >> header-n += kvm_para.h >> endif > > This series intends all headers are exported from uapi/, correct? > Do we still need to check $(srctree)/arch/$(SRCARCH)/include/asm/*.h ? > (related to [1]) No you're right, uapi/asm/*.h is enough. Those files should be exported only if the uapi/asm/ counterpart exists. > > > > [3] > >> --- 7.1 header-n >> >> header-n is essentially used by include/uapi/linux/Kbuild to avoid >> exporting specific headers (e.g. kvm.h) on architectures that do not >> support it. It should be avoided as much as possible. > > > Going forward, header-y will be never used > because uapi/ is exported by default. > > So, I wonder if we could rename this into something clearer. > > Kbuild supports "no-clean-files". > (Please see ./Kbuild for its usage) > I guess this notation seems clearer > when we want to negate the default behavior. > > Can you consider "no-export", "no-export-files", "no-export-headers" > or whatever you like? No problem, let's use no-export-headers. Thank you, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v10 00/11] uapi: export all headers under uapi directories 2017-03-27 9:45 ` Nicolas Dichtel @ 2017-03-27 15:33 ` Masahiro Yamada 0 siblings, 0 replies; 554+ messages in thread From: Masahiro Yamada @ 2017-03-27 15:33 UTC (permalink / raw) To: Nicolas Dichtel Cc: Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David S. Miller, Russell King, bp, slash.tmp, Daniel Vetter, rmk+kernel, msalter, jengelh, hch, Tobias Klauser, mpe, Ingo Molnar, Thomas Gleixner, Dmitry V. Levin, Herbert Xu, linux-rdma Hi Nicolas, 2017-03-27 18:45 GMT+09:00 Nicolas Dichtel <nicolas.dichtel@6wind.com>: >> I wanted to leave comments/questions on 10/11, >> but I could not find 10/11 in my mailbox. I do not know why. > Note that you can download the mail from the kbuild patchwork, open it with your > email client and do a reply ;-) I took the patch from the patchwork for git-am, but I was too lazy to import it to my mailer. I will try it next time. Thanks for the tip! -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v11 00/12] uapi: export all headers under uapi directories 2017-03-24 8:42 ` Masahiro Yamada 2017-03-24 9:03 ` Nicolas Dichtel @ 2017-03-27 12:20 ` Nicolas Dichtel [not found] ` <1490617217-30192-1-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> ` (9 more replies) 1 sibling, 10 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 12:20 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma Patches #1 and #2 are just cleanup: some exported headers were still under a non-uapi directory. Patch #3 is a fix to avoid exporting a file that was not under an uapi directory. After these three patches, all exported headers are under an uapi directory: path #4 stops searching files in non uapi directories. The patch #5 was spotted by code review: there is no in-tree user of this functionality. Patch #6 fixes some warnings/errors reported by 0-day tests. Patch #7 to #9 fix some errors when the corresponding files are included by userland. Patches #10 and #11 remove the need to list explicitly headers. Now all files under an uapi directory are exported. Patch #12 is also a small cleanup. This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built on top of masahiroy/linux-kbuild.git#for-next (v4.11-rc1). I didn't find any conflict with v4.11-rc4. v10 -> v11: - patch #1: restore the double '_' in the header guard - patch #6, #7, #8: order '#include' in alphabetical order - patch #10: rename header-n to no-export-headers cleanup management of kvm.h, kvm_para.h and a.out.h - patch #12: add it - rebase on top of masahiroy/linux-kbuild.git#for-next v9 -> v10: - rebase on top of masahiroy/linux-kbuild.git#for-next - patch #4 & #10: fix dependency check - fix some typos in commits logs v8 -> v9: - rebase on top of linus tree - patch #8: add include/uapi/linux/crypto.h v7 -> v8: - rebase on top of linus tree - add patch #7, #8 and #9 v6 -> v7: - rebase on top of linus tree - patch #7: remove autogenerated files from the list in the commit log v5 -> v6: - patch #6: remove change of include/uapi/linux/media.h - patch #7: fix hdr export when 'make O=' is used (look for genhdr files in the right directory) - patch #8: fix 'make headers_check' v4 -> v5: - patch #3: get back to v3 (don't export msr-index.h) - patch #6: new in this version - patch #7: fix compilation by introducing header-n v3 -> v4: - first patch has been included - patch #4: get back to v2 and remove arch/x86/include/asm/msr-index.h v2 -> v3: - patch #1: remove arch/arm/include/asm/types.h - patch #2: remove arch/h8300/include/asm/bitsperlong.h - patch #3: remove arch/nios2/include/uapi/asm/setup.h - patch #4: don't export msr-index.h - patch #5: fix a typo: s/unput-files3-name/input-files3-name - patch #6: no change - patch #7: fix include/uapi/asm-generic/Kbuild.asm by introducing mandatory-y - add patch #8 v1 -> v2: - add patch #1 to #6 - patch #7: remove use of header-y Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
[parent not found: <1490617217-30192-1-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>]
* [PATCH v11 01/12] h8300: put bitsperlong.h in uapi 2017-03-27 12:20 ` [PATCH v11 00/12] " Nicolas Dichtel @ 2017-03-27 12:20 ` Nicolas Dichtel 2017-03-27 12:20 ` [PATCH v11 03/12] x86: stop exporting msr-index.h to userland Nicolas Dichtel ` (8 subsequent siblings) 9 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 12:20 UTC (permalink / raw) To: yamada.masahiro-uWyLwvC0a2jby3iVrkZq2A Cc: arnd-r2nGTMty4D4, mmarek-IBi9RG/b67k, linux-kbuild-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-arch-u79uwXL29TY76Z2rM5mHXA, airlied-cv59FeDIM0c, davem-fT/PcQaiUtIeIZ0/mPfg9Q, linux-I+IVW8TIWO2tmTQ+vhA3Yw, bp-Gina5bIWoIWzQB+pC5nmwQ, slash.tmp-GANU6spQydw, daniel.vetter-/w4YWyX8dFk, rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw, msalter-H+wXaHxf7aLQT0dZR+AlfA, jengelh-9+2X+4sQBs8, hch-wEGCiKHe2LqWVfeAwA7xHQ, tklauser-93Khv+1bN0NyDzI6CaY1VQ, mpe-Gsx/Oe8HsFggBc27wqDAHg, mingo-DgEjT+Ai2ygdnm+yROfE0A, tglx-hfZtesqFncYOwBW4kG4KsQ, ldv-u2l5PoMzF/Vg9hUCZPvPmw, nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w, herbert-lOAM2aK0SrRLBo1qDEOMRrpzq4S04n8Q, linux-rdma-u79uwXL29TY76Z2rM5mHXA This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> --- arch/h8300/include/asm/bitsperlong.h | 14 -------------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h deleted file mode 100644 index e140e46729ac..000000000000 --- a/arch/h8300/include/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __ASM_H8300_BITS_PER_LONG -#define __ASM_H8300_BITS_PER_LONG - -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif - -#endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..34212608371e --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI__ASM_H8300_BITS_PER_LONG +#define _UAPI__ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI__ASM_H8300_BITS_PER_LONG */ -- 2.8.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v11 01/12] h8300: put bitsperlong.h in uapi @ 2017-03-27 12:20 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 12:20 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This header file is exported, thus move it to uapi. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/h8300/include/asm/bitsperlong.h | 14 -------------- arch/h8300/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h deleted file mode 100644 index e140e46729ac..000000000000 --- a/arch/h8300/include/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __ASM_H8300_BITS_PER_LONG -#define __ASM_H8300_BITS_PER_LONG - -#include <asm-generic/bitsperlong.h> - -#if !defined(__ASSEMBLY__) -/* h8300-unknown-linux required long */ -#define __kernel_size_t __kernel_size_t -typedef unsigned long __kernel_size_t; -typedef long __kernel_ssize_t; -typedef long __kernel_ptrdiff_t; -#endif - -#endif /* __ASM_H8300_BITS_PER_LONG */ diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..34212608371e --- /dev/null +++ b/arch/h8300/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +#ifndef _UAPI__ASM_H8300_BITS_PER_LONG +#define _UAPI__ASM_H8300_BITS_PER_LONG + +#include <asm-generic/bitsperlong.h> + +#if !defined(__ASSEMBLY__) +/* h8300-unknown-linux required long */ +#define __kernel_size_t __kernel_size_t +typedef unsigned long __kernel_size_t; +typedef long __kernel_ssize_t; +typedef long __kernel_ptrdiff_t; +#endif + +#endif /* _UAPI__ASM_H8300_BITS_PER_LONG */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v11 02/12] nios2: put setup.h in uapi 2017-03-27 12:20 ` [PATCH v11 00/12] " Nicolas Dichtel @ 2017-03-27 12:20 ` Nicolas Dichtel 2017-03-27 12:20 ` [PATCH v11 03/12] x86: stop exporting msr-index.h to userland Nicolas Dichtel ` (8 subsequent siblings) 9 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 12:20 UTC (permalink / raw) To: yamada.masahiro-uWyLwvC0a2jby3iVrkZq2A Cc: arnd-r2nGTMty4D4, mmarek-IBi9RG/b67k, linux-kbuild-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-arch-u79uwXL29TY76Z2rM5mHXA, airlied-cv59FeDIM0c, davem-fT/PcQaiUtIeIZ0/mPfg9Q, linux-I+IVW8TIWO2tmTQ+vhA3Yw, bp-Gina5bIWoIWzQB+pC5nmwQ, slash.tmp-GANU6spQydw, daniel.vetter-/w4YWyX8dFk, rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw, msalter-H+wXaHxf7aLQT0dZR+AlfA, jengelh-9+2X+4sQBs8, hch-wEGCiKHe2LqWVfeAwA7xHQ, tklauser-93Khv+1bN0NyDzI6CaY1VQ, mpe-Gsx/Oe8HsFggBc27wqDAHg, mingo-DgEjT+Ai2ygdnm+yROfE0A, tglx-hfZtesqFncYOwBW4kG4KsQ, ldv-u2l5PoMzF/Vg9hUCZPvPmw, nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w, herbert-lOAM2aK0SrRLBo1qDEOMRrpzq4S04n8Q, linux-rdma-u79uwXL29TY76Z2rM5mHXA This header file is exported, but from a userland pov, it's just a wrapper to asm-generic/setup.h. Signed-off-by: Nicolas Dichtel <nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> Reviewed-by: Tobias Klauser <tklauser-93Khv+1bN0NyDzI6CaY1VQ@public.gmane.org> --- arch/nios2/include/uapi/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..69c965304146 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -2,4 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h +generic-y += setup.h generic-y += ucontext.h -- 2.8.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v11 02/12] nios2: put setup.h in uapi @ 2017-03-27 12:20 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 12:20 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This header file is exported, but from a userland pov, it's just a wrapper to asm-generic/setup.h. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: Tobias Klauser <tklauser@distanz.ch> --- arch/nios2/include/uapi/asm/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index e0bb972a50d7..69c965304146 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -2,4 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h +generic-y += setup.h generic-y += ucontext.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v11 04/12] Makefile.headersinst: cleanup input files 2017-03-27 12:20 ` [PATCH v11 00/12] " Nicolas Dichtel @ 2017-03-27 12:20 ` Nicolas Dichtel 2017-03-27 12:20 ` [PATCH v11 03/12] x86: stop exporting msr-index.h to userland Nicolas Dichtel ` (8 subsequent siblings) 9 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 12:20 UTC (permalink / raw) To: yamada.masahiro-uWyLwvC0a2jby3iVrkZq2A Cc: arnd-r2nGTMty4D4, mmarek-IBi9RG/b67k, linux-kbuild-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-arch-u79uwXL29TY76Z2rM5mHXA, airlied-cv59FeDIM0c, davem-fT/PcQaiUtIeIZ0/mPfg9Q, linux-I+IVW8TIWO2tmTQ+vhA3Yw, bp-Gina5bIWoIWzQB+pC5nmwQ, slash.tmp-GANU6spQydw, daniel.vetter-/w4YWyX8dFk, rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw, msalter-H+wXaHxf7aLQT0dZR+AlfA, jengelh-9+2X+4sQBs8, hch-wEGCiKHe2LqWVfeAwA7xHQ, tklauser-93Khv+1bN0NyDzI6CaY1VQ, mpe-Gsx/Oe8HsFggBc27wqDAHg, mingo-DgEjT+Ai2ygdnm+yROfE0A, tglx-hfZtesqFncYOwBW4kG4KsQ, ldv-u2l5PoMzF/Vg9hUCZPvPmw, nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w, herbert-lOAM2aK0SrRLBo1qDEOMRrpzq4S04n8Q, linux-rdma-u79uwXL29TY76Z2rM5mHXA After the last three patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that input-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> --- scripts/Makefile.headersinst | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..7bd9df6efe2f 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ @@ -106,7 +94,9 @@ __headersinst: $(subdirs) $(install-file) @: targets += $(install-file) -$(install-file): scripts/headers_install.sh $(input-files1) $(input-files2) $(input-files3) FORCE +$(install-file): scripts/headers_install.sh \ + $(addprefix $(srcdir)/,$(header-y)) \ + $(addprefix $(gendir)/,$(genhdr-y)) FORCE $(if $(unwanted),$(call cmd,remove),) $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@))) $(call if_changed,install) -- 2.8.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v11 04/12] Makefile.headersinst: cleanup input files @ 2017-03-27 12:20 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 12:20 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma After the last three patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that input-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..7bd9df6efe2f 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ @@ -106,7 +94,9 @@ __headersinst: $(subdirs) $(install-file) @: targets += $(install-file) -$(install-file): scripts/headers_install.sh $(input-files1) $(input-files2) $(input-files3) FORCE +$(install-file): scripts/headers_install.sh \ + $(addprefix $(srcdir)/,$(header-y)) \ + $(addprefix $(gendir)/,$(genhdr-y)) FORCE $(if $(unwanted),$(call cmd,remove),) $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@))) $(call if_changed,install) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v11 11/12] uapi: export all arch specifics directories 2017-03-27 12:20 ` [PATCH v11 00/12] " Nicolas Dichtel @ 2017-03-27 12:20 ` Nicolas Dichtel 2017-03-27 12:20 ` [PATCH v11 03/12] x86: stop exporting msr-index.h to userland Nicolas Dichtel ` (8 subsequent siblings) 9 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 12:20 UTC (permalink / raw) To: yamada.masahiro-uWyLwvC0a2jby3iVrkZq2A Cc: arnd-r2nGTMty4D4, mmarek-IBi9RG/b67k, linux-kbuild-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-arch-u79uwXL29TY76Z2rM5mHXA, airlied-cv59FeDIM0c, davem-fT/PcQaiUtIeIZ0/mPfg9Q, linux-I+IVW8TIWO2tmTQ+vhA3Yw, bp-Gina5bIWoIWzQB+pC5nmwQ, slash.tmp-GANU6spQydw, daniel.vetter-/w4YWyX8dFk, rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw, msalter-H+wXaHxf7aLQT0dZR+AlfA, jengelh-9+2X+4sQBs8, hch-wEGCiKHe2LqWVfeAwA7xHQ, tklauser-93Khv+1bN0NyDzI6CaY1VQ, mpe-Gsx/Oe8HsFggBc27wqDAHg, mingo-DgEjT+Ai2ygdnm+yROfE0A, tglx-hfZtesqFncYOwBW4kG4KsQ, ldv-u2l5PoMzF/Vg9hUCZPvPmw, nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w, herbert-lOAM2aK0SrRLBo1qDEOMRrpzq4S04n8Q, linux-rdma-u79uwXL29TY76Z2rM5mHXA This patch removes the need of subdir-y. Now all files/directories under arch/<arch>/include/uapi/ are exported. The only change for userland is the layout of the command 'make headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. Those new directories contains all files/directories of the specified arch. Note that only cris and tile have more directories than only asm: - arch-v[10|32] for cris; - arch for tile. Signed-off-by: Nicolas Dichtel <nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> --- Documentation/kbuild/makefiles.txt | 15 +-------------- Makefile | 6 +++--- arch/cris/include/uapi/asm/Kbuild | 3 --- arch/tile/include/uapi/asm/Kbuild | 2 -- scripts/Makefile.headersinst | 3 +-- 5 files changed, 5 insertions(+), 24 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index b9f7ca4e62ae..e18daca65ccd 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -49,7 +49,6 @@ This document describes the Linux kernel Makefiles. --- 7.3 generic-y --- 7.4 generated-y --- 7.5 mandatory-y - --- 7.6 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1265,7 +1264,7 @@ The pre-processing does: - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) All headers under include/uapi/, include/generated/uapi/, -arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/ are exported. A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and @@ -1338,18 +1337,6 @@ See subsequent chapter for the syntax of the Kbuild file. The convention is to list one subdir per line and preferably in alphabetic order. - --- 7.6 subdir-y - - subdir-y may be used to specify a subdirectory to be exported. - - Example: - #arch/cris/include/uapi/asm/Kbuild - subdir-y += ../arch-v10/arch/ - subdir-y += ../arch-v32/arch/ - - The convention is to list one subdir per line and - preferably in alphabetic order. - === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/Makefile b/Makefile index 6ea27d9f1384..50547481ed5a 100644 --- a/Makefile +++ b/Makefile @@ -1131,7 +1131,7 @@ firmware_install: export INSTALL_HDR_PATH = $(objtree)/usr # If we do an all arch process set dst to asm-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) PHONY += archheaders archheaders: @@ -1152,7 +1152,7 @@ headers_install: __headers $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all @@ -1161,7 +1161,7 @@ headers_check_all: headers_install_all PHONY += headers_check headers_check: headers_install $(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1 - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1 + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/ $(hdr-dst) HDRCHECK=1 # --------------------------------------------------------------------------- # Kernel selftest diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d0c5471856e0..b15bf6bc0e94 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -subdir-y += ../arch-v10/arch/ -subdir-y += ../arch-v32/arch/ diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index e0a50111e07f..0c74c3c5ebfa 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -2,5 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ucontext.h - -subdir-y += ../arch diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 20be1fbc19cc..6ba97a1f9c5a 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -2,7 +2,7 @@ # Installing headers # # All headers under include/uapi, include/generated/uapi, -# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are # exported. # They are preprocessed to remove __KERNEL__ section of the file. # @@ -30,7 +30,6 @@ installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) subdirs := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/*/.)) -subdirs += $(subdir-y) header-files := $(notdir $(wildcard $(srcdir)/*.h)) header-files += $(notdir $(wildcard $(srcdir)/*.agh)) header-files := $(filter-out $(no-export-headers), $(header-files)) -- 2.8.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v11 11/12] uapi: export all arch specifics directories @ 2017-03-27 12:20 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 12:20 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This patch removes the need of subdir-y. Now all files/directories under arch/<arch>/include/uapi/ are exported. The only change for userland is the layout of the command 'make headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. Those new directories contains all files/directories of the specified arch. Note that only cris and tile have more directories than only asm: - arch-v[10|32] for cris; - arch for tile. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 15 +-------------- Makefile | 6 +++--- arch/cris/include/uapi/asm/Kbuild | 3 --- arch/tile/include/uapi/asm/Kbuild | 2 -- scripts/Makefile.headersinst | 3 +-- 5 files changed, 5 insertions(+), 24 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index b9f7ca4e62ae..e18daca65ccd 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -49,7 +49,6 @@ This document describes the Linux kernel Makefiles. --- 7.3 generic-y --- 7.4 generated-y --- 7.5 mandatory-y - --- 7.6 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1265,7 +1264,7 @@ The pre-processing does: - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) All headers under include/uapi/, include/generated/uapi/, -arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/ are exported. A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and @@ -1338,18 +1337,6 @@ See subsequent chapter for the syntax of the Kbuild file. The convention is to list one subdir per line and preferably in alphabetic order. - --- 7.6 subdir-y - - subdir-y may be used to specify a subdirectory to be exported. - - Example: - #arch/cris/include/uapi/asm/Kbuild - subdir-y += ../arch-v10/arch/ - subdir-y += ../arch-v32/arch/ - - The convention is to list one subdir per line and - preferably in alphabetic order. - === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/Makefile b/Makefile index 6ea27d9f1384..50547481ed5a 100644 --- a/Makefile +++ b/Makefile @@ -1131,7 +1131,7 @@ firmware_install: export INSTALL_HDR_PATH = $(objtree)/usr # If we do an all arch process set dst to asm-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) PHONY += archheaders archheaders: @@ -1152,7 +1152,7 @@ headers_install: __headers $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all @@ -1161,7 +1161,7 @@ headers_check_all: headers_install_all PHONY += headers_check headers_check: headers_install $(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1 - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1 + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/ $(hdr-dst) HDRCHECK=1 # --------------------------------------------------------------------------- # Kernel selftest diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d0c5471856e0..b15bf6bc0e94 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -subdir-y += ../arch-v10/arch/ -subdir-y += ../arch-v32/arch/ diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index e0a50111e07f..0c74c3c5ebfa 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -2,5 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ucontext.h - -subdir-y += ../arch diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 20be1fbc19cc..6ba97a1f9c5a 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -2,7 +2,7 @@ # Installing headers # # All headers under include/uapi, include/generated/uapi, -# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are # exported. # They are preprocessed to remove __KERNEL__ section of the file. # @@ -30,7 +30,6 @@ installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) subdirs := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/*/.)) -subdirs += $(subdir-y) header-files := $(notdir $(wildcard $(srcdir)/*.h)) header-files += $(notdir $(wildcard $(srcdir)/*.agh)) header-files := $(filter-out $(no-export-headers), $(header-files)) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v11 11/12] uapi: export all arch specifics directories 2017-03-27 12:20 ` Nicolas Dichtel (?) @ 2017-05-16 1:02 ` Dan Williams 2017-05-16 1:15 ` Dan Williams -1 siblings, 1 reply; 554+ messages in thread From: Dan Williams @ 2017-05-16 1:02 UTC (permalink / raw) To: Nicolas Dichtel Cc: yamada.masahiro, Arnd Bergmann, mmarek, linux-kbuild, Linux Kernel Mailing List, linux-arch, airlied, David Miller, linux, Borislav Petkov, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, Christoph Hellwig, tklauser, Michael Ellerman, Ingo Molnar, Thomas Gleixner, ldv, Herbert Xu, linux-rdma On Mon, Mar 27, 2017 at 5:20 AM, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This patch removes the need of subdir-y. Now all files/directories under > arch/<arch>/include/uapi/ are exported. > > The only change for userland is the layout of the command 'make > headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. > Those new directories contains all files/directories of the specified arch. > > Note that only cris and tile have more directories than only asm: > - arch-v[10|32] for cris; > - arch for tile. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Starting with commit 61562f981e92 "uapi: export all arch specifics directories", a "make INSTALL_HDR_PATH=$root/usr headers_install" operation will delete standard glibc headers and others in $root/usr/include. Here's the snippet from the build process where it deletes system headers with this commit: CHK include/generated/uapi/linux/version.h INSTALL include/linux/nfsd (5 files) INSTALL include/linux (482 files) REMOVE libgen.h resolv.h paths.h syscall.h spawn.h unistd.h ar.h setjmp.h termio.h wchar.h semaphore.h fcntl.h fpu_control.h glob.h termios.h nss.h fmtmsg.h shadow.h crypt.h aio.h grp.h uchar.h libudev.h argz.h utime.h complex.h obstack.h argp.h math.h sched.h xlocale.h netdb.h link.h mqueue.h ulimit.h regex.h fstab.h sgtty.h iconv.h dirent.h inttypes.h pty.h locale.h utmp.h pthread.h gconv.h lastlog.h assert.h endian.h stdio_ext.h signal.h search.h ctype.h execinfo.h values.h re_comp.h libio.h ustat.h printf.h getopt.h time.h stab.h stdlib.h gshadow.h mntent.h stdc-predef.h libkmod.h memory.h nl_types.h mcheck.h errno.h poll.h fnmatch.h limits.h ucontext.h libintl.h envz.h stdio.h wait.h monetary.h _G_config.h dlfcn.h wordexp.h string.h pwd.h tar.h proc_service.h tgmath.h byteswap.h elf.h cpio.h aliases.h wctype.h ftw.h ieee754.h err.h langinfo.h fts.h features.h gnu-versions.h malloc.h regexp.h stdint.h ifaddrs.h syslog.h error.h a.out.h utmpx.h sysexits.h fenv.h ttyent.h alloca.h thread_db.h strings.h ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v11 11/12] uapi: export all arch specifics directories 2017-05-16 1:02 ` Dan Williams @ 2017-05-16 1:15 ` Dan Williams 2017-05-16 4:59 ` Masahiro Yamada 0 siblings, 1 reply; 554+ messages in thread From: Dan Williams @ 2017-05-16 1:15 UTC (permalink / raw) To: Nicolas Dichtel Cc: yamada.masahiro, Arnd Bergmann, mmarek, linux-kbuild, Linux Kernel Mailing List, linux-arch, airlied, David Miller, linux, Borislav Petkov, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, Christoph Hellwig, tklauser, Michael Ellerman, Ingo Molnar, Thomas Gleixner, ldv, Herbert Xu, linux-rdma On Mon, May 15, 2017 at 6:02 PM, Dan Williams <dan.j.williams@intel.com> wrote: > On Mon, Mar 27, 2017 at 5:20 AM, Nicolas Dichtel > <nicolas.dichtel@6wind.com> wrote: >> This patch removes the need of subdir-y. Now all files/directories under >> arch/<arch>/include/uapi/ are exported. >> >> The only change for userland is the layout of the command 'make >> headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. >> Those new directories contains all files/directories of the specified arch. >> >> Note that only cris and tile have more directories than only asm: >> - arch-v[10|32] for cris; >> - arch for tile. >> >> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > > Starting with commit 61562f981e92 "uapi: export all arch specifics > directories", a "make INSTALL_HDR_PATH=$root/usr headers_install" > operation will delete standard glibc headers and others in > $root/usr/include. Reverting commit 61562f981e92 fixes the problem for me. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v11 11/12] uapi: export all arch specifics directories 2017-05-16 1:15 ` Dan Williams @ 2017-05-16 4:59 ` Masahiro Yamada 0 siblings, 0 replies; 554+ messages in thread From: Masahiro Yamada @ 2017-05-16 4:59 UTC (permalink / raw) To: Dan Williams Cc: Nicolas Dichtel, Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David Miller, Russell King, Borislav Petkov, slash.tmp, Daniel Vetter, Russell King, msalter, jengelh, Christoph Hellwig, Tobias Klauser, Michael Ellerman, Ingo Molnar, Thomas Gleixner, Dmitry V. Levin, Herbert Xu Hi Dan, 2017-05-16 10:15 GMT+09:00 Dan Williams <dan.j.williams@intel.com>: > On Mon, May 15, 2017 at 6:02 PM, Dan Williams <dan.j.williams@intel.com> wrote: >> On Mon, Mar 27, 2017 at 5:20 AM, Nicolas Dichtel >> <nicolas.dichtel@6wind.com> wrote: >>> This patch removes the need of subdir-y. Now all files/directories under >>> arch/<arch>/include/uapi/ are exported. >>> >>> The only change for userland is the layout of the command 'make >>> headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. >>> Those new directories contains all files/directories of the specified arch. >>> >>> Note that only cris and tile have more directories than only asm: >>> - arch-v[10|32] for cris; >>> - arch for tile. >>> >>> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> >> >> Starting with commit 61562f981e92 "uapi: export all arch specifics >> directories", a "make INSTALL_HDR_PATH=$root/usr headers_install" >> operation will delete standard glibc headers and others in >> $root/usr/include. > > Reverting commit 61562f981e92 fixes the problem for me. Thank you for your bug report. Could you check this? https://patchwork.kernel.org/patch/9728323/ -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v11 11/12] uapi: export all arch specifics directories @ 2017-05-16 4:59 ` Masahiro Yamada 0 siblings, 0 replies; 554+ messages in thread From: Masahiro Yamada @ 2017-05-16 4:59 UTC (permalink / raw) To: Dan Williams Cc: Nicolas Dichtel, Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David Miller, Russell King, Borislav Petkov, slash.tmp, Daniel Vetter, Russell King, msalter, jengelh, Christoph Hellwig, Tobias Klauser, Michael Ellerman, Ingo Molnar, Thomas Gleixner, Dmitry V. Levin, Herbert Xu, linux-rdma Hi Dan, 2017-05-16 10:15 GMT+09:00 Dan Williams <dan.j.williams@intel.com>: > On Mon, May 15, 2017 at 6:02 PM, Dan Williams <dan.j.williams@intel.com> wrote: >> On Mon, Mar 27, 2017 at 5:20 AM, Nicolas Dichtel >> <nicolas.dichtel@6wind.com> wrote: >>> This patch removes the need of subdir-y. Now all files/directories under >>> arch/<arch>/include/uapi/ are exported. >>> >>> The only change for userland is the layout of the command 'make >>> headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. >>> Those new directories contains all files/directories of the specified arch. >>> >>> Note that only cris and tile have more directories than only asm: >>> - arch-v[10|32] for cris; >>> - arch for tile. >>> >>> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> >> >> Starting with commit 61562f981e92 "uapi: export all arch specifics >> directories", a "make INSTALL_HDR_PATH=$root/usr headers_install" >> operation will delete standard glibc headers and others in >> $root/usr/include. > > Reverting commit 61562f981e92 fixes the problem for me. Thank you for your bug report. Could you check this? https://patchwork.kernel.org/patch/9728323/ -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v11 03/12] x86: stop exporting msr-index.h to userland 2017-03-27 12:20 ` [PATCH v11 00/12] " Nicolas Dichtel [not found] ` <1490617217-30192-1-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> @ 2017-03-27 12:20 ` Nicolas Dichtel 2017-03-27 12:20 ` [PATCH v11 05/12] Makefile.headersinst: remove destination-y option Nicolas Dichtel ` (7 subsequent siblings) 9 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 12:20 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma Even if this file was not in an uapi directory, it was exported because it was listed in the Kbuild file. Fixes: b72e7464e4cf ("x86/uapi: Do not export <asm/msr-index.h> as part of the user API headers") Suggested-by: Borislav Petkov <bp@alien8.de> CC: Ingo Molnar <mingo@kernel.org> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Ingo Molnar <mingo@kernel.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> --- arch/x86/include/uapi/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..1c532b3f18ea 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -27,7 +27,6 @@ header-y += ldt.h header-y += mce.h header-y += mman.h header-y += msgbuf.h -header-y += msr-index.h header-y += msr.h header-y += mtrr.h header-y += param.h -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v11 05/12] Makefile.headersinst: remove destination-y option 2017-03-27 12:20 ` [PATCH v11 00/12] " Nicolas Dichtel [not found] ` <1490617217-30192-1-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> 2017-03-27 12:20 ` [PATCH v11 03/12] x86: stop exporting msr-index.h to userland Nicolas Dichtel @ 2017-03-27 12:20 ` Nicolas Dichtel 2017-03-27 12:20 ` [PATCH v11 06/12] uapi: includes linux/types.h before exporting files Nicolas Dichtel ` (6 subsequent siblings) 9 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 12:20 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Paul Bolle <pebolle@tiscali.nl> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 7bd9df6efe2f..ca5d439c9abf 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v11 06/12] uapi: includes linux/types.h before exporting files 2017-03-27 12:20 ` [PATCH v11 00/12] " Nicolas Dichtel ` (2 preceding siblings ...) 2017-03-27 12:20 ` [PATCH v11 05/12] Makefile.headersinst: remove destination-y option Nicolas Dichtel @ 2017-03-27 12:20 ` Nicolas Dichtel 2017-03-27 12:20 ` [PATCH v11 07/12] btrfs_tree.h: fix include from userland Nicolas Dichtel ` (5 subsequent siblings) 9 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 12:20 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma Some files will be exported after a following patch. 0-day tests report the following warning/error: ./usr/include/linux/bcache.h:8: include of <linux/types.h> is preferred over <asm/types.h> ./usr/include/linux/bcache.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/qrtr.h:8: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/cryptouser.h:39: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/pr.h:14: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/btrfs_tree.h:337: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/rdma/bnxt_re-abi.h:45: found __[us]{8,16,32,64} type without #include <linux/types.h> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/uapi/linux/bcache.h | 2 +- include/uapi/linux/btrfs_tree.h | 2 ++ include/uapi/linux/cryptouser.h | 2 ++ include/uapi/linux/pr.h | 2 ++ include/uapi/linux/qrtr.h | 1 + include/uapi/rdma/bnxt_re-abi.h | 2 ++ 6 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h index 22b6ad31c706..e3bb0635e94a 100644 --- a/include/uapi/linux/bcache.h +++ b/include/uapi/linux/bcache.h @@ -5,7 +5,7 @@ * Bcache on disk data structures */ -#include <asm/types.h> +#include <linux/types.h> #define BITMASK(name, type, field, offset, size) \ static inline __u64 name(const type *k) \ diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h index d5ad15a106a7..6a261cb52d95 100644 --- a/include/uapi/linux/btrfs_tree.h +++ b/include/uapi/linux/btrfs_tree.h @@ -1,6 +1,8 @@ #ifndef _BTRFS_CTREE_H_ #define _BTRFS_CTREE_H_ +#include <linux/types.h> + /* * This header contains the structure definitions and constants used * by file system objects that can be retrieved using diff --git a/include/uapi/linux/cryptouser.h b/include/uapi/linux/cryptouser.h index 11d21fce14d6..c6a09c5261e7 100644 --- a/include/uapi/linux/cryptouser.h +++ b/include/uapi/linux/cryptouser.h @@ -18,6 +18,8 @@ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <linux/types.h> + /* Netlink configuration messages. */ enum { CRYPTO_MSG_BASE = 0x10, diff --git a/include/uapi/linux/pr.h b/include/uapi/linux/pr.h index 57d7c0f916b6..645ef3cf3dd0 100644 --- a/include/uapi/linux/pr.h +++ b/include/uapi/linux/pr.h @@ -1,6 +1,8 @@ #ifndef _UAPI_PR_H #define _UAPI_PR_H +#include <linux/types.h> + enum pr_type { PR_WRITE_EXCLUSIVE = 1, PR_EXCLUSIVE_ACCESS = 2, diff --git a/include/uapi/linux/qrtr.h b/include/uapi/linux/qrtr.h index 66c0748d26e2..9d76c566f66e 100644 --- a/include/uapi/linux/qrtr.h +++ b/include/uapi/linux/qrtr.h @@ -2,6 +2,7 @@ #define _LINUX_QRTR_H #include <linux/socket.h> +#include <linux/types.h> struct sockaddr_qrtr { __kernel_sa_family_t sq_family; diff --git a/include/uapi/rdma/bnxt_re-abi.h b/include/uapi/rdma/bnxt_re-abi.h index e2c8a3f0ccec..74018bd18d72 100644 --- a/include/uapi/rdma/bnxt_re-abi.h +++ b/include/uapi/rdma/bnxt_re-abi.h @@ -39,6 +39,8 @@ #ifndef __BNXT_RE_UVERBS_ABI_H__ #define __BNXT_RE_UVERBS_ABI_H__ +#include <linux/types.h> + #define BNXT_RE_ABI_VERSION 1 struct bnxt_re_uctx_resp { -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v11 07/12] btrfs_tree.h: fix include from userland 2017-03-27 12:20 ` [PATCH v11 00/12] " Nicolas Dichtel ` (3 preceding siblings ...) 2017-03-27 12:20 ` [PATCH v11 06/12] uapi: includes linux/types.h before exporting files Nicolas Dichtel @ 2017-03-27 12:20 ` Nicolas Dichtel 2017-03-27 12:20 ` [PATCH v11 08/12] cryptouser.h: " Nicolas Dichtel ` (4 subsequent siblings) 9 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 12:20 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This patch prepares the uapi export by fixing the following errors: .../linux/btrfs_tree.h:283:2: error: #error "UUID items require BTRFS_UUID_SIZE == 16!" #error "UUID items require BTRFS_UUID_SIZE == 16!" .../linux/btrfs_tree.h:390:12: error: ‘BTRFS_UUID_SIZE’ undeclared here (not in a function) __u8 uuid[BTRFS_UUID_SIZE]; ^ .../linux/btrfs_tree.h:796:16: error: ‘BTRFS_DEV_STAT_VALUES_MAX’ undeclared here (not in a function) __le64 values[BTRFS_DEV_STAT_VALUES_MAX]; Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/uapi/linux/btrfs_tree.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h index 6a261cb52d95..10689e1fdf11 100644 --- a/include/uapi/linux/btrfs_tree.h +++ b/include/uapi/linux/btrfs_tree.h @@ -1,6 +1,7 @@ #ifndef _BTRFS_CTREE_H_ #define _BTRFS_CTREE_H_ +#include <linux/btrfs.h> #include <linux/types.h> /* -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v11 08/12] cryptouser.h: fix include from userland 2017-03-27 12:20 ` [PATCH v11 00/12] " Nicolas Dichtel ` (4 preceding siblings ...) 2017-03-27 12:20 ` [PATCH v11 07/12] btrfs_tree.h: fix include from userland Nicolas Dichtel @ 2017-03-27 12:20 ` Nicolas Dichtel 2017-04-11 2:40 ` Herbert Xu 2017-03-27 12:20 ` [PATCH v11 09/12] smc_diag.h: " Nicolas Dichtel ` (3 subsequent siblings) 9 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 12:20 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This patch prepares the uapi export by fixing the following error: .../linux/cryptouser.h:58:16: error: ‘CRYPTO_MAX_ALG_NAME’ undeclared here (not in a function) char cru_name[CRYPTO_MAX_ALG_NAME]; Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> --- include/linux/crypto.h | 2 +- include/uapi/linux/crypto.h | 14 ++++++++++++++ include/uapi/linux/cryptouser.h | 6 ++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 include/uapi/linux/crypto.h diff --git a/include/linux/crypto.h b/include/linux/crypto.h index c0b0cf3d2d2f..cc2425ba8527 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -24,6 +24,7 @@ #include <linux/slab.h> #include <linux/string.h> #include <linux/uaccess.h> +#include <uapi/linux/crypto.h> /* * Autoloaded crypto modules should only use a prefixed name to avoid allowing @@ -123,7 +124,6 @@ /* * Miscellaneous stuff. */ -#define CRYPTO_MAX_ALG_NAME 64 /* * The macro CRYPTO_MINALIGN_ATTR (along with the void * type in the actual diff --git a/include/uapi/linux/crypto.h b/include/uapi/linux/crypto.h new file mode 100644 index 000000000000..e342c5a5ac50 --- /dev/null +++ b/include/uapi/linux/crypto.h @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2017 Nicolas Dichtel <nicolas.dichtel@6wind.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + */ + +#ifndef _UAPI_CRYPTO_H +#define _UAPI_CRYPTO_H + +#define CRYPTO_MAX_ALG_NAME 64 + +#endif /* _UAPI_CRYPTO_H */ diff --git a/include/uapi/linux/cryptouser.h b/include/uapi/linux/cryptouser.h index c6a09c5261e7..751e7daef54a 100644 --- a/include/uapi/linux/cryptouser.h +++ b/include/uapi/linux/cryptouser.h @@ -18,6 +18,10 @@ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef _UAPI_CRYPTOUSER_H +#define _UAPI_CRYPTOUSER_H + +#include <linux/crypto.h> #include <linux/types.h> /* Netlink configuration messages. */ @@ -121,3 +125,5 @@ struct crypto_report_acomp { #define CRYPTO_REPORT_MAXSIZE (sizeof(struct crypto_user_alg) + \ sizeof(struct crypto_report_blkcipher)) + +#endif /* _UAPI_CRYPTOUSER_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v11 08/12] cryptouser.h: fix include from userland 2017-03-27 12:20 ` [PATCH v11 08/12] cryptouser.h: " Nicolas Dichtel @ 2017-04-11 2:40 ` Herbert Xu 0 siblings, 0 replies; 554+ messages in thread From: Herbert Xu @ 2017-04-11 2:40 UTC (permalink / raw) To: Nicolas Dichtel Cc: yamada.masahiro, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, linux-rdma On Mon, Mar 27, 2017 at 02:20:13PM +0200, Nicolas Dichtel wrote: > This patch prepares the uapi export by fixing the following error: > > .../linux/cryptouser.h:58:16: error: ‘CRYPTO_MAX_ALG_NAME’ undeclared here (not in a function) > char cru_name[CRYPTO_MAX_ALG_NAME]; > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Can we revert this patch please? I had forgotten about it when increasing the in-kernel CRYPTO_MAX_ALG_NAME so it now conflicts with the crypto tree. The crypto tree has fixed the problem in a different way. Thanks, -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v11 09/12] smc_diag.h: fix include from userland 2017-03-27 12:20 ` [PATCH v11 00/12] " Nicolas Dichtel ` (5 preceding siblings ...) 2017-03-27 12:20 ` [PATCH v11 08/12] cryptouser.h: " Nicolas Dichtel @ 2017-03-27 12:20 ` Nicolas Dichtel 2017-03-27 12:20 ` [PATCH v11 10/12] uapi: export all headers under uapi directories Nicolas Dichtel ` (2 subsequent siblings) 9 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 12:20 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This patch prepares the uapi export by fixing the following error: .../linux/smc_diag.h:6:27: fatal error: rdma/ib_verbs.h: No such file or directory #include <rdma/ib_verbs.h> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/rdma/ib_verbs.h | 3 +-- include/uapi/linux/smc_diag.h | 2 +- include/uapi/rdma/ib_user_verbs.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 0f1813c13687..50f276a4afdc 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -61,6 +61,7 @@ #include <linux/mmu_notifier.h> #include <linux/uaccess.h> #include <linux/cgroup_rdma.h> +#include <uapi/rdma/ib_user_verbs.h> extern struct workqueue_struct *ib_wq; extern struct workqueue_struct *ib_comp_wq; @@ -1838,8 +1839,6 @@ enum ib_mad_result { IB_MAD_RESULT_CONSUMED = 1 << 2 /* Packet consumed: stop processing */ }; -#define IB_DEVICE_NAME_MAX 64 - struct ib_port_cache { struct ib_pkey_cache *pkey; struct ib_gid_table *gid; diff --git a/include/uapi/linux/smc_diag.h b/include/uapi/linux/smc_diag.h index 0063919fea34..87712bfaa9dd 100644 --- a/include/uapi/linux/smc_diag.h +++ b/include/uapi/linux/smc_diag.h @@ -3,7 +3,7 @@ #include <linux/types.h> #include <linux/inet_diag.h> -#include <rdma/ib_verbs.h> +#include <rdma/ib_user_verbs.h> /* Request structure */ struct smc_diag_req { diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h index 997f904c7692..8edce2b65903 100644 --- a/include/uapi/rdma/ib_user_verbs.h +++ b/include/uapi/rdma/ib_user_verbs.h @@ -1124,4 +1124,6 @@ struct ib_uverbs_ex_destroy_rwq_ind_table { __u32 ind_tbl_handle; }; +#define IB_DEVICE_NAME_MAX 64 + #endif /* IB_USER_VERBS_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v11 10/12] uapi: export all headers under uapi directories 2017-03-27 12:20 ` [PATCH v11 00/12] " Nicolas Dichtel ` (6 preceding siblings ...) 2017-03-27 12:20 ` [PATCH v11 09/12] smc_diag.h: " Nicolas Dichtel @ 2017-03-27 12:20 ` Nicolas Dichtel 2017-05-07 23:17 ` Masahiro Yamada 2017-03-27 12:20 ` [PATCH v11 12/12] arch/include: remove empty Kbuild files Nicolas Dichtel 2017-03-27 15:35 ` [PATCH v11 00/12] uapi: export all headers under uapi directories Masahiro Yamada 9 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 12:20 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-arc/kvm_para.h asm-arc/ucontext.h asm-avr32/kvm_para.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-c6x/shmparam.h asm-c6x/ucontext.h asm-cris/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-hexagon/shmparam.h asm-m32r/kvm_para.h asm-m68k/kvm_para.h asm-m68k/shmparam.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-mips/hwcap.h asm-mips/reg.h asm-mips/ucontext.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-openrisc/shmparam.h asm-parisc/kvm_para.h asm-powerpc/perf_regs.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-tile/shmparam.h asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-x86/hwcap2.h asm-xtensa/kvm_para.h drm/armada_drm.h drm/etnaviv_drm.h drm/vgem_drm.h linux/auto_dev-ioctl.h linux/bcache.h linux/btrfs_tree.h linux/cifs/cifs_mount.h linux/coresight-stm.h linux/crypto.h linux/cryptouser.h linux/genwqe/genwqe_card.h linux/hash_info.h linux/kcm.h linux/kcov.h linux/kfd_ioctl.h linux/lightnvm.h linux/module.h linux/nilfs2_api.h linux/nilfs2_ondisk.h linux/nsfs.h linux/pr.h linux/qrtr.h linux/rpmsg.h linux/sched/types.h linux/sed-opal.h linux/smc.h linux/smc_diag.h linux/stm.h linux/userio.h linux/virtio_mmio.h linux/wil6210_uapi.h rdma/bnxt_re-abi.h Note that I have removed from this list the files which are generated in every exported directories (like .install or .install.cmd). Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. For the record, note that exported files for asm directories are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/<arch>/include/uapi/asm/Kbuild; - arch/<arch>/include/asm/Kbuild. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Mark Salter <msalter@redhat.com> Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) --- Documentation/kbuild/makefiles.txt | 66 ++-- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 - arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 3 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 53 --- arch/score/include/asm/Kbuild | 3 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 58 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 -- include/uapi/asm-generic/Kbuild.asm | 76 ++--- include/uapi/drm/Kbuild | 23 -- include/uapi/linux/Kbuild | 491 +--------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 - include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 16 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 20 -- include/uapi/rdma/hfi/Kbuild | 3 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 55 ++-- 81 files changed, 111 insertions(+), 1774 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..b9f7ca4e62ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,10 +44,12 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 no-export-headers --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y + --- 7.5 mandatory-y + --- 7.6 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1235,7 +1237,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1264,30 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. -See subsequent chapter for the syntax of the Kbuild file. - - --- 7.1 header-y - - header-y specifies header files to be exported. - - Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. - The convention is to list one file per line and - preferably in alphabetic order. +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. +See subsequent chapter for the syntax of the Kbuild file. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. + --- 7.1 no-export-headers - Subdirectories are visited before their parent directories. + no-export-headers is essentially used by include/uapi/linux/Kbuild to + avoid exporting specific headers (e.g. kvm.h) on architectures that do + not support it. It should be avoided as much as possible. --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y @@ -1334,6 +1329,27 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h + --- 7.5 mandatory-y + + mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm + to define the minimun set of headers that must be exported in + include/asm. + + The convention is to list one subdir per line and + preferably in alphabetic order. + + --- 7.6 subdir-y + + subdir-y may be used to specify a subdirectory to be exported. + + Example: + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ + + The convention is to list one subdir per line and + preferably in alphabetic order. + === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index 797b64a4b80b..65f48073f8ac 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 69c965304146..374bd123329f 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,6 +1,5 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h - generic-y += setup.h generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index fb01873a5aad..1b533a107f19 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bitsperlong.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index 6848ba5c1454..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,55 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += pkey.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index 926943a49ea5..4ee7fc77d23c 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += - generic-y += barrier.h generic-y += clkdev.h generic-y += current.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index aa48b6eaff2d..61157a7e8532 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 1c532b3f18ea..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,61 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..21381449d98a 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -1,49 +1,33 @@ # -# 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) \ - )) +mandatory-y += auxvec.h +mandatory-y += bitsperlong.h +mandatory-y += byteorder.h +mandatory-y += errno.h +mandatory-y += fcntl.h +mandatory-y += ioctl.h +mandatory-y += ioctls.h +mandatory-y += ipcbuf.h +mandatory-y += mman.h +mandatory-y += msgbuf.h +mandatory-y += param.h +mandatory-y += poll.h +mandatory-y += posix_types.h +mandatory-y += ptrace.h +mandatory-y += resource.h +mandatory-y += sembuf.h +mandatory-y += setup.h +mandatory-y += shmbuf.h +mandatory-y += sigcontext.h +mandatory-y += siginfo.h +mandatory-y += signal.h +mandatory-y += socket.h +mandatory-y += sockios.h +mandatory-y += stat.h +mandatory-y += statfs.h +mandatory-y += swab.h +mandatory-y += termbits.h +mandatory-y += termios.h +mandatory-y += types.h +mandatory-y += unistd.h diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index c97addd08f8c..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,23 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += omap_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index dd9820b1c779..ca2787d9bf0f 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -1,492 +1,13 @@ # UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),) +no-export-headers += a.out.h endif -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += batman_adv.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dma-buf.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += ife.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h),) +no-export-headers += kvm.h endif - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h),) +no-export-headers += kvm_para.h endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += psample.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += seg6_genl.h -header-y += seg6.h -header-y += seg6_hmac.h -header-y += seg6_iptunnel.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += timerfd.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_mmio.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index ba62ddf0e58a..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_sample.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 1e0af1ff75c3..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,20 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += rdma_user_ioctl.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h -header-y += qedr-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index b65b0b3a5f63..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h -header-y += hfi1_ioctl.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index ca5d439c9abf..20be1fbc19cc 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,19 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +27,15 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +srcdir := $(srctree)/$(obj) +gendir := $(objtree)/$(gen) +subdirs := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srcdir)/*.h)) +header-files += $(notdir $(wildcard $(srcdir)/*.agh)) +header-files := $(filter-out $(no-export-headers), $(header-files)) +genhdr-files := $(notdir $(wildcard $(gendir)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,25 +43,20 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) - -srcdir := $(srctree)/$(obj) -gendir := $(objtree)/$(gen) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) +ifneq ($(mandatory-y),) +missing := $(filter-out $(all-files),$(mandatory-y)) +ifneq ($(missing),) +$(error Some mandatory headers ($(missing)) are missing in $(obj)) +endif +endif # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -67,8 +70,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ @@ -95,8 +98,8 @@ __headersinst: $(subdirs) $(install-file) targets += $(install-file) $(install-file): scripts/headers_install.sh \ - $(addprefix $(srcdir)/,$(header-y)) \ - $(addprefix $(gendir)/,$(genhdr-y)) FORCE + $(addprefix $(srcdir)/,$(header-files)) \ + $(addprefix $(gendir)/,$(genhdr-files)) FORCE $(if $(unwanted),$(call cmd,remove),) $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@))) $(call if_changed,install) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v11 10/12] uapi: export all headers under uapi directories 2017-03-27 12:20 ` [PATCH v11 10/12] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-05-07 23:17 ` Masahiro Yamada 2017-05-09 10:09 ` Nicolas Dichtel 0 siblings, 1 reply; 554+ messages in thread From: Masahiro Yamada @ 2017-05-07 23:17 UTC (permalink / raw) To: Nicolas Dichtel; +Cc: Linux Kbuild mailing list, Linux Kernel Mailing List Hi Nicolas 2017-03-27 21:20 GMT+09:00 Nicolas Dichtel <nicolas.dichtel@6wind.com>: > Regularly, when a new header is created in include/uapi/, the developer > forgets to add it in the corresponding Kbuild file. This error is usually > detected after the release is out. > > In fact, all headers under uapi directories should be exported, thus it's > useless to have an exhaustive list. > > After this patch, the following files, which were not exported, are now > exported (with make headers_install_all): > asm-arc/kvm_para.h > asm-arc/ucontext.h > asm-avr32/kvm_para.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-c6x/shmparam.h > asm-c6x/ucontext.h > asm-cris/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-hexagon/shmparam.h > asm-m32r/kvm_para.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > asm-mips/ucontext.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-openrisc/shmparam.h > asm-parisc/kvm_para.h > asm-powerpc/perf_regs.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-tile/shmparam.h > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-x86/hwcap2.h > asm-xtensa/kvm_para.h > drm/armada_drm.h > drm/etnaviv_drm.h > drm/vgem_drm.h > linux/auto_dev-ioctl.h > linux/bcache.h > linux/btrfs_tree.h > linux/cifs/cifs_mount.h > linux/coresight-stm.h > linux/crypto.h > linux/cryptouser.h > linux/genwqe/genwqe_card.h > linux/hash_info.h > linux/kcm.h > linux/kcov.h > linux/kfd_ioctl.h > linux/lightnvm.h > linux/module.h > linux/nilfs2_api.h > linux/nilfs2_ondisk.h > linux/nsfs.h > linux/pr.h > linux/qrtr.h > linux/rpmsg.h > linux/sched/types.h > linux/sed-opal.h > linux/smc.h > linux/smc_diag.h > linux/stm.h > linux/userio.h > linux/virtio_mmio.h > linux/wil6210_uapi.h > rdma/bnxt_re-abi.h I will send pull-requests for v4.12 in a few days. I need to fix a complex conflict reported by https://lkml.org/lkml/2017/4/10/1208 I rebased linux-kbuild/uapi on commit 13e0988140 (dropping 08/12 "cryptouser.h: fix include from userland"). I updated the list of headers, which were not exported, are now exported. If you find something is wrong, please let me know. The list is now as follows: asm-arc/kvm_para.h asm-arc/ucontext.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-c6x/shmparam.h asm-c6x/ucontext.h asm-cris/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-hexagon/shmparam.h asm-m32r/kvm_para.h asm-m68k/kvm_para.h asm-m68k/shmparam.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-mips/hwcap.h asm-mips/reg.h asm-mips/ucontext.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-openrisc/shmparam.h asm-parisc/kvm_para.h asm-powerpc/perf_regs.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-tile/shmparam.h asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-x86/hwcap2.h asm-xtensa/kvm_para.h drm/armada_drm.h drm/etnaviv_drm.h drm/vgem_drm.h linux/aspeed-lpc-ctrl.h linux/auto_dev-ioctl.h linux/bcache.h linux/btrfs_tree.h linux/can/vxcan.h linux/cifs/cifs_mount.h linux/coresight-stm.h linux/cryptouser.h linux/genwqe/genwqe_card.h linux/fsmap.h linux/hash_info.h linux/kcm.h linux/kcov.h linux/kfd_ioctl.h linux/lightnvm.h linux/module.h linux/nbd-netlink.h linux/nilfs2_api.h linux/nilfs2_ondisk.h linux/nsfs.h linux/pr.h linux/qrtr.h linux/rpmsg.h linux/sched/types.h linux/sed-opal.h linux/smc.h linux/smc_diag.h linux/stm.h linux/wil6210_uapi.h rdma/bnxt_re-abi.h -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v11 10/12] uapi: export all headers under uapi directories 2017-05-07 23:17 ` Masahiro Yamada @ 2017-05-09 10:09 ` Nicolas Dichtel 2017-05-09 17:22 ` Masahiro Yamada 0 siblings, 1 reply; 554+ messages in thread From: Nicolas Dichtel @ 2017-05-09 10:09 UTC (permalink / raw) To: Masahiro Yamada; +Cc: Linux Kbuild mailing list, Linux Kernel Mailing List Le 08/05/2017 à 01:17, Masahiro Yamada a écrit : Hi Masahiro, [snip] > I will send pull-requests for v4.12 in a few days. > > I need to fix a complex conflict reported by > https://lkml.org/lkml/2017/4/10/1208 > > I rebased linux-kbuild/uapi on commit 13e0988140 > (dropping 08/12 "cryptouser.h: fix include from userland"). Ok. > > > I updated the list of headers, which were not exported, > are now exported. > > If you find something is wrong, please let me know. > The list is now as follows: > > asm-arc/kvm_para.h > asm-arc/ucontext.h > asm-blackfin/shmparam.h > asm-blackfin/ucontext.h > asm-c6x/shmparam.h > asm-c6x/ucontext.h > asm-cris/kvm_para.h > asm-h8300/shmparam.h > asm-h8300/ucontext.h > asm-hexagon/shmparam.h > asm-m32r/kvm_para.h > asm-m68k/kvm_para.h > asm-m68k/shmparam.h > asm-metag/kvm_para.h > asm-metag/shmparam.h > asm-metag/ucontext.h > asm-mips/hwcap.h > asm-mips/reg.h > asm-mips/ucontext.h > asm-nios2/kvm_para.h > asm-nios2/ucontext.h > asm-openrisc/shmparam.h > asm-parisc/kvm_para.h > asm-powerpc/perf_regs.h > asm-sh/kvm_para.h > asm-sh/ucontext.h > asm-tile/shmparam.h > asm-unicore32/shmparam.h > asm-unicore32/ucontext.h > asm-x86/hwcap2.h > asm-xtensa/kvm_para.h > drm/armada_drm.h > drm/etnaviv_drm.h > drm/vgem_drm.h > linux/aspeed-lpc-ctrl.h > linux/auto_dev-ioctl.h > linux/bcache.h > linux/btrfs_tree.h > linux/can/vxcan.h > linux/cifs/cifs_mount.h > linux/coresight-stm.h > linux/cryptouser.h > linux/genwqe/genwqe_card.h > linux/fsmap.h > linux/hash_info.h > linux/kcm.h > linux/kcov.h > linux/kfd_ioctl.h > linux/lightnvm.h > linux/module.h > linux/nbd-netlink.h > linux/nilfs2_api.h > linux/nilfs2_ondisk.h > linux/nsfs.h > linux/pr.h > linux/qrtr.h > linux/rpmsg.h > linux/sched/types.h > linux/sed-opal.h > linux/smc.h > linux/smc_diag.h > linux/stm.h > linux/wil6210_uapi.h > rdma/bnxt_re-abi.h linux/vfio_ccw.h is missing in your list. And to be a bit picky, linux/fsmap.h should be put before linux/genwqe/genwqe_card.h ;-) I've rebased my tree on commit 2868b2513aa7 (see https://github.com/NicolasDichtel/linux/commits/master) and the following file should also be added after that: linux/switchtec_ioctl.h. Thank you, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v11 10/12] uapi: export all headers under uapi directories 2017-05-09 10:09 ` Nicolas Dichtel @ 2017-05-09 17:22 ` Masahiro Yamada 0 siblings, 0 replies; 554+ messages in thread From: Masahiro Yamada @ 2017-05-09 17:22 UTC (permalink / raw) To: Nicolas Dichtel; +Cc: Linux Kbuild mailing list, Linux Kernel Mailing List Hi Nicolas, 2017-05-09 19:09 GMT+09:00 Nicolas Dichtel <nicolas.dichtel@6wind.com>: > Le 08/05/2017 à 01:17, Masahiro Yamada a écrit : > Hi Masahiro, > > [snip] > >> I will send pull-requests for v4.12 in a few days. >> >> I need to fix a complex conflict reported by >> https://lkml.org/lkml/2017/4/10/1208 >> >> I rebased linux-kbuild/uapi on commit 13e0988140 >> (dropping 08/12 "cryptouser.h: fix include from userland"). > Ok. > >> >> >> I updated the list of headers, which were not exported, >> are now exported. >> >> If you find something is wrong, please let me know. >> The list is now as follows: >> >> asm-arc/kvm_para.h >> asm-arc/ucontext.h >> asm-blackfin/shmparam.h >> asm-blackfin/ucontext.h >> asm-c6x/shmparam.h >> asm-c6x/ucontext.h >> asm-cris/kvm_para.h >> asm-h8300/shmparam.h >> asm-h8300/ucontext.h >> asm-hexagon/shmparam.h >> asm-m32r/kvm_para.h >> asm-m68k/kvm_para.h >> asm-m68k/shmparam.h >> asm-metag/kvm_para.h >> asm-metag/shmparam.h >> asm-metag/ucontext.h >> asm-mips/hwcap.h >> asm-mips/reg.h >> asm-mips/ucontext.h >> asm-nios2/kvm_para.h >> asm-nios2/ucontext.h >> asm-openrisc/shmparam.h >> asm-parisc/kvm_para.h >> asm-powerpc/perf_regs.h >> asm-sh/kvm_para.h >> asm-sh/ucontext.h >> asm-tile/shmparam.h >> asm-unicore32/shmparam.h >> asm-unicore32/ucontext.h >> asm-x86/hwcap2.h >> asm-xtensa/kvm_para.h >> drm/armada_drm.h >> drm/etnaviv_drm.h >> drm/vgem_drm.h >> linux/aspeed-lpc-ctrl.h >> linux/auto_dev-ioctl.h >> linux/bcache.h >> linux/btrfs_tree.h >> linux/can/vxcan.h >> linux/cifs/cifs_mount.h >> linux/coresight-stm.h >> linux/cryptouser.h >> linux/genwqe/genwqe_card.h >> linux/fsmap.h >> linux/hash_info.h >> linux/kcm.h >> linux/kcov.h >> linux/kfd_ioctl.h >> linux/lightnvm.h >> linux/module.h >> linux/nbd-netlink.h >> linux/nilfs2_api.h >> linux/nilfs2_ondisk.h >> linux/nsfs.h >> linux/pr.h >> linux/qrtr.h >> linux/rpmsg.h >> linux/sched/types.h >> linux/sed-opal.h >> linux/smc.h >> linux/smc_diag.h >> linux/stm.h >> linux/wil6210_uapi.h >> rdma/bnxt_re-abi.h > > linux/vfio_ccw.h is missing in your list. > And to be a bit picky, linux/fsmap.h should be put before > linux/genwqe/genwqe_card.h ;-) > > I've rebased my tree on commit 2868b2513aa7 (see > https://github.com/NicolasDichtel/linux/commits/master) and the following file > should also be added after that: linux/switchtec_ioctl.h. > This is helpful. Thank you! -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v11 12/12] arch/include: remove empty Kbuild files 2017-03-27 12:20 ` [PATCH v11 00/12] " Nicolas Dichtel ` (7 preceding siblings ...) 2017-03-27 12:20 ` [PATCH v11 10/12] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-03-27 12:20 ` Nicolas Dichtel 2017-03-27 15:35 ` [PATCH v11 00/12] uapi: export all headers under uapi directories Masahiro Yamada 9 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-03-27 12:20 UTC (permalink / raw) To: yamada.masahiro Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- arch/cris/include/arch-v10/arch/Kbuild | 1 - arch/cris/include/arch-v32/arch/Kbuild | 1 - arch/tile/include/arch/Kbuild | 1 - 3 files changed, 3 deletions(-) delete mode 100644 arch/cris/include/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/arch/Kbuild diff --git a/arch/cris/include/arch-v10/arch/Kbuild b/arch/cris/include/arch-v10/arch/Kbuild deleted file mode 100644 index 1f0fc7a66f5f..000000000000 --- a/arch/cris/include/arch-v10/arch/Kbuild +++ /dev/null @@ -1 +0,0 @@ -# CRISv10 arch diff --git a/arch/cris/include/arch-v32/arch/Kbuild b/arch/cris/include/arch-v32/arch/Kbuild deleted file mode 100644 index 2fd65c7e15c9..000000000000 --- a/arch/cris/include/arch-v32/arch/Kbuild +++ /dev/null @@ -1 +0,0 @@ -# CRISv32 arch diff --git a/arch/tile/include/arch/Kbuild b/arch/tile/include/arch/Kbuild deleted file mode 100644 index 3751c9fabcf2..000000000000 --- a/arch/tile/include/arch/Kbuild +++ /dev/null @@ -1 +0,0 @@ -# Tile arch headers -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v11 00/12] uapi: export all headers under uapi directories 2017-03-27 12:20 ` [PATCH v11 00/12] " Nicolas Dichtel ` (8 preceding siblings ...) 2017-03-27 12:20 ` [PATCH v11 12/12] arch/include: remove empty Kbuild files Nicolas Dichtel @ 2017-03-27 15:35 ` Masahiro Yamada 9 siblings, 0 replies; 554+ messages in thread From: Masahiro Yamada @ 2017-03-27 15:35 UTC (permalink / raw) To: Nicolas Dichtel Cc: Arnd Bergmann, Michal Marek, Linux Kbuild mailing list, Linux Kernel Mailing List, linux-arch, David Airlie, David S. Miller, Russell King, bp, slash.tmp, Daniel Vetter, rmk+kernel, msalter, jengelh, hch, Tobias Klauser, mpe, Ingo Molnar, Thomas Gleixner, Dmitry V. Levin, Herbert Xu, linux-rdma 2017-03-27 21:20 GMT+09:00 Nicolas Dichtel <nicolas.dichtel@6wind.com>: > > > Patches #1 and #2 are just cleanup: some exported headers were still under > a non-uapi directory. Patch #3 is a fix to avoid exporting a file that was > not under an uapi directory. > After these three patches, all exported headers are under an uapi directory: > path #4 stops searching files in non uapi directories. > The patch #5 was spotted by code review: there is no in-tree user of this > functionality. > Patch #6 fixes some warnings/errors reported by 0-day tests. > Patch #7 to #9 fix some errors when the corresponding files are included by > userland. > Patches #10 and #11 remove the need to list explicitly headers. Now all files > under an uapi directory are exported. > Patch #12 is also a small cleanup. > > This series has been tested with a 'make headers_install' on x86 and a > 'make headers_install_all'. I've checked the result of both commands. > > This patch is built on top of masahiroy/linux-kbuild.git#for-next (v4.11-rc1). > I didn't find any conflict with v4.11-rc4. > > v10 -> v11: > - patch #1: restore the double '_' in the header guard > - patch #6, #7, #8: order '#include' in alphabetical order > - patch #10: rename header-n to no-export-headers > cleanup management of kvm.h, kvm_para.h and a.out.h > - patch #12: add it > - rebase on top of masahiroy/linux-kbuild.git#for-next Series, applied to linux-kbuild/uapi. Thanks! -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v8 09/11] smc_diag.h: fix include from userland 2017-02-28 20:47 ` [PATCH v8 00/11] " Nicolas Dichtel ` (7 preceding siblings ...) 2017-02-28 20:47 ` [PATCH v8 08/11] cryptouser.h: " Nicolas Dichtel @ 2017-02-28 20:47 ` Nicolas Dichtel 2017-02-28 20:47 ` [PATCH v8 10/11] uapi: export all headers under uapi directories Nicolas Dichtel 2017-02-28 20:47 ` [PATCH v8 11/11] uapi: export all arch specifics directories Nicolas Dichtel 10 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-28 20:47 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This patch prepares the uapi export by fixing the following error: .../linux/smc_diag.h:6:27: fatal error: rdma/ib_verbs.h: No such file or directory #include <rdma/ib_verbs.h> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- include/rdma/ib_verbs.h | 3 +-- include/uapi/linux/smc_diag.h | 2 +- include/uapi/rdma/ib_user_verbs.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 0f1813c13687..50f276a4afdc 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -61,6 +61,7 @@ #include <linux/mmu_notifier.h> #include <linux/uaccess.h> #include <linux/cgroup_rdma.h> +#include <uapi/rdma/ib_user_verbs.h> extern struct workqueue_struct *ib_wq; extern struct workqueue_struct *ib_comp_wq; @@ -1838,8 +1839,6 @@ enum ib_mad_result { IB_MAD_RESULT_CONSUMED = 1 << 2 /* Packet consumed: stop processing */ }; -#define IB_DEVICE_NAME_MAX 64 - struct ib_port_cache { struct ib_pkey_cache *pkey; struct ib_gid_table *gid; diff --git a/include/uapi/linux/smc_diag.h b/include/uapi/linux/smc_diag.h index 0063919fea34..87712bfaa9dd 100644 --- a/include/uapi/linux/smc_diag.h +++ b/include/uapi/linux/smc_diag.h @@ -3,7 +3,7 @@ #include <linux/types.h> #include <linux/inet_diag.h> -#include <rdma/ib_verbs.h> +#include <rdma/ib_user_verbs.h> /* Request structure */ struct smc_diag_req { diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h index 997f904c7692..8edce2b65903 100644 --- a/include/uapi/rdma/ib_user_verbs.h +++ b/include/uapi/rdma/ib_user_verbs.h @@ -1124,4 +1124,6 @@ struct ib_uverbs_ex_destroy_rwq_ind_table { __u32 ind_tbl_handle; }; +#define IB_DEVICE_NAME_MAX 64 + #endif /* IB_USER_VERBS_H */ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v8 10/11] uapi: export all headers under uapi directories 2017-02-28 20:47 ` [PATCH v8 00/11] " Nicolas Dichtel ` (8 preceding siblings ...) 2017-02-28 20:47 ` [PATCH v8 09/11] smc_diag.h: fix include from userland Nicolas Dichtel @ 2017-02-28 20:47 ` Nicolas Dichtel 2017-02-28 20:47 ` [PATCH v8 11/11] uapi: export all arch specifics directories Nicolas Dichtel 10 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-28 20:47 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-arc/kvm_para.h asm-arc/ucontext.h asm-avr32/kvm_para.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-c6x/shmparam.h asm-c6x/ucontext.h asm-cris/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-hexagon/shmparam.h asm-m32r/kvm_para.h asm-m68k/kvm_para.h asm-m68k/shmparam.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-mips/hwcap.h asm-mips/reg.h asm-mips/ucontext.h asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-openrisc/shmparam.h asm-parisc/kvm_para.h asm-powerpc/perf_regs.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-tile/shmparam.h asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-x86/hwcap2.h asm-xtensa/kvm_para.h drm/armada_drm.h drm/etnaviv_drm.h drm/vgem_drm.h linux/auto_dev-ioctl.h linux/bcache.h linux/btrfs_tree.h linux/cifs linux/cifs/cifs_mount.h linux/coresight-stm.h linux/cryptouser.h linux/genwqe linux/genwqe/genwqe_card.h linux/hash_info.h linux/kcm.h linux/kcov.h linux/kfd_ioctl.h linux/lightnvm.h linux/module.h linux/nilfs2_api.h linux/nilfs2_ondisk.h linux/nsfs.h linux/pr.h linux/qrtr.h linux/rpmsg.h linux/sed-opal.h linux/smc.h linux/smc_diag.h linux/stm.h linux/userio.h linux/wil6210_uapi.h rdma/bnxt_re-abi.h Note that I have removed from this list the files which are generated in every exported directories (like .install or .install.cmd). Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. For the record, note that exported files for asm directories are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/<arch>/include/uapi/asm/Kbuild; - arch/<arch>/include/asm/Kbuild. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Mark Salter <msalter@redhat.com> Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) --- Documentation/kbuild/makefiles.txt | 66 ++-- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 - arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 3 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 53 --- arch/score/include/asm/Kbuild | 3 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 58 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 -- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 23 -- include/uapi/linux/Kbuild | 493 +--------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 - include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 16 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 20 -- include/uapi/rdma/hfi/Kbuild | 3 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 51 +-- 81 files changed, 113 insertions(+), 1756 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..91ffb391ed54 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,10 +44,12 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 header-n --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y + --- 7.5 mandatory-y + --- 7.6 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1235,7 +1237,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1264,30 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. -See subsequent chapter for the syntax of the Kbuild file. - - --- 7.1 header-y - - header-y specifies header files to be exported. - - Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. - The convention is to list one file per line and - preferably in alphabetic order. +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. +See subsequent chapter for the syntax of the Kbuild file. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. + --- 7.1 header-n - Subdirectories are visited before their parent directories. + header-n is essentially used by include/uapi/linux/Kbuild to avoid + exporting specific headers (e.g. kvm.h) on architectures that do not + support it. It should be avoided as much as possible. --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y @@ -1334,6 +1329,27 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h + --- 7.5 mandatory-y + + mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm + to define the minimun set of headers that must be exported in + include/asm. + + The convention is to list one subdir per line and + preferably in alphabetic order. + + --- 7.6 subdir-y + + subdir-y may be used to specify a subdirectory to be exported. + + Example: + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ + + The convention is to list one subdir per line and + preferably in alphabetic order. + === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index 797b64a4b80b..65f48073f8ac 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 69c965304146..374bd123329f 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,6 +1,5 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h - generic-y += setup.h generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index fb01873a5aad..1b533a107f19 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bitsperlong.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index 6848ba5c1454..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,55 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += pkey.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index 926943a49ea5..4ee7fc77d23c 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += - generic-y += barrier.h generic-y += clkdev.h generic-y += current.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index aa48b6eaff2d..61157a7e8532 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 1c532b3f18ea..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,61 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..8e6b335664f2 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +mandatory-y += auxvec.h +mandatory-y += bitsperlong.h +mandatory-y += byteorder.h +mandatory-y += errno.h +mandatory-y += fcntl.h +mandatory-y += ioctl.h +mandatory-y += ioctls.h +mandatory-y += ipcbuf.h +mandatory-y += mman.h +mandatory-y += msgbuf.h +mandatory-y += param.h +mandatory-y += poll.h +mandatory-y += posix_types.h +mandatory-y += ptrace.h +mandatory-y += resource.h +mandatory-y += sembuf.h +mandatory-y += setup.h +mandatory-y += shmbuf.h +mandatory-y += sigcontext.h +mandatory-y += siginfo.h +mandatory-y += signal.h +mandatory-y += socket.h +mandatory-y += sockios.h +mandatory-y += stat.h +mandatory-y += statfs.h +mandatory-y += swab.h +mandatory-y += termbits.h +mandatory-y += termios.h +mandatory-y += types.h +mandatory-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +mandatory-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index c97addd08f8c..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,23 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += omap_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index 1c80efb67d10..456cbe8a2aad 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -1,491 +1,16 @@ # UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) +header-n += a.out.h endif -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += batman_adv.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dma-buf.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += ife.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) +header-n += kvm.h endif - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h +ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ + $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) +header-n += kvm_para.h endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += psample.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += seg6_genl.h -header-y += seg6.h -header-y += seg6_hmac.h -header-y += seg6_iptunnel.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += timerfd.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index ba62ddf0e58a..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_sample.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 1e0af1ff75c3..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,20 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += rdma_user_ioctl.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h -header-y += qedr-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index b65b0b3a5f63..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h -header-y += hfi1_ioctl.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..122945618ae2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,19 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +27,15 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +srcdir := $(srctree)/$(obj) +gendir := $(objtree)/$(gen) +subdirs := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srcdir)/*.h)) +header-files += $(notdir $(wildcard $(srcdir)/*.agh)) +header-files := $(filter-out $(header-n), $(header-files)) +genhdr-files := $(notdir $(wildcard $(gendir)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,25 +43,20 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) - -srcdir := $(srctree)/$(obj) -gendir := $(objtree)/$(gen) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) +ifneq ($(mandatory-y),) +missing := $(filter-out $(all-files),$(mandatory-y)) +ifneq ($(missing),) +$(error Some mandatory headers ($(missing)) are missing in $(obj)) +endif +endif # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -67,8 +70,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v8 11/11] uapi: export all arch specifics directories 2017-02-28 20:47 ` [PATCH v8 00/11] " Nicolas Dichtel ` (9 preceding siblings ...) 2017-02-28 20:47 ` [PATCH v8 10/11] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-02-28 20:47 ` Nicolas Dichtel 10 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-28 20:47 UTC (permalink / raw) To: arnd, mmarek Cc: linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, ldv, nicolas.dichtel, herbert, linux-rdma This patch removes the need of subdir-y. Now all files/directories under arch/<arch>/include/uapi/ are exported. The only change for userland is the layout of the command 'make headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. Those new directories contains all files/directories of the specified arch. Note that only cris and tile have more directories than only asm: - arch-v[10|32] for cris; - arch for tile. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 15 +-------------- Makefile | 6 +++--- arch/cris/include/uapi/asm/Kbuild | 3 --- arch/tile/include/uapi/asm/Kbuild | 2 -- scripts/Makefile.headersinst | 3 +-- 5 files changed, 5 insertions(+), 24 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 91ffb391ed54..223b33d5195a 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -49,7 +49,6 @@ This document describes the Linux kernel Makefiles. --- 7.3 generic-y --- 7.4 generated-y --- 7.5 mandatory-y - --- 7.6 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1265,7 +1264,7 @@ The pre-processing does: - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) All headers under include/uapi/, include/generated/uapi/, -arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/ are exported. A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and @@ -1338,18 +1337,6 @@ See subsequent chapter for the syntax of the Kbuild file. The convention is to list one subdir per line and preferably in alphabetic order. - --- 7.6 subdir-y - - subdir-y may be used to specify a subdirectory to be exported. - - Example: - #arch/cris/include/uapi/asm/Kbuild - subdir-y += ../arch-v10/arch/ - subdir-y += ../arch-v32/arch/ - - The convention is to list one subdir per line and - preferably in alphabetic order. - === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/Makefile b/Makefile index b83109b5d217..ecb319dd6675 100644 --- a/Makefile +++ b/Makefile @@ -1128,7 +1128,7 @@ firmware_install: export INSTALL_HDR_PATH = $(objtree)/usr # If we do an all arch process set dst to asm-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) PHONY += archheaders archheaders: @@ -1149,7 +1149,7 @@ headers_install: __headers $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all @@ -1158,7 +1158,7 @@ headers_check_all: headers_install_all PHONY += headers_check headers_check: headers_install $(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1 - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1 + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/ $(hdr-dst) HDRCHECK=1 # --------------------------------------------------------------------------- # Kernel selftest diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d0c5471856e0..b15bf6bc0e94 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -subdir-y += ../arch-v10/arch/ -subdir-y += ../arch-v32/arch/ diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index e0a50111e07f..0c74c3c5ebfa 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -2,5 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ucontext.h - -subdir-y += ../arch diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 122945618ae2..1aeb4f45208f 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -2,7 +2,7 @@ # Installing headers # # All headers under include/uapi, include/generated/uapi, -# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are # exported. # They are preprocessed to remove __KERNEL__ section of the file. # @@ -30,7 +30,6 @@ installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) subdirs := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/*/.)) -subdirs += $(subdir-y) header-files := $(notdir $(wildcard $(srcdir)/*.h)) header-files += $(notdir $(wildcard $(srcdir)/*.agh)) header-files := $(filter-out $(header-n), $(header-files)) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v7 8/8] uapi: export all arch specifics directories 2017-02-24 16:49 ` [PATCH v7 0/8] " Nicolas Dichtel ` (6 preceding siblings ...) 2017-02-24 16:49 ` [PATCH v7 7/8] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-02-24 16:49 ` Nicolas Dichtel 7 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-24 16:49 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, tglx, Nicolas Dichtel This patch removes the need of subdir-y. Now all files/directories under arch/<arch>/include/uapi/ are exported. The only change for userland is the layout of the command 'make headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. Those new directories contains all files/directories of the specified arch. Note that only cris and tile have more directories than only asm: - arch-v[10|32] for cris; - arch for tile. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 15 +-------------- Makefile | 6 +++--- arch/cris/include/uapi/asm/Kbuild | 3 --- arch/tile/include/uapi/asm/Kbuild | 2 -- scripts/Makefile.headersinst | 3 +-- 5 files changed, 5 insertions(+), 24 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 91ffb391ed54..223b33d5195a 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -49,7 +49,6 @@ This document describes the Linux kernel Makefiles. --- 7.3 generic-y --- 7.4 generated-y --- 7.5 mandatory-y - --- 7.6 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1265,7 +1264,7 @@ The pre-processing does: - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) All headers under include/uapi/, include/generated/uapi/, -arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/ are exported. A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and @@ -1338,18 +1337,6 @@ See subsequent chapter for the syntax of the Kbuild file. The convention is to list one subdir per line and preferably in alphabetic order. - --- 7.6 subdir-y - - subdir-y may be used to specify a subdirectory to be exported. - - Example: - #arch/cris/include/uapi/asm/Kbuild - subdir-y += ../arch-v10/arch/ - subdir-y += ../arch-v32/arch/ - - The convention is to list one subdir per line and - preferably in alphabetic order. - === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/Makefile b/Makefile index b83109b5d217..ecb319dd6675 100644 --- a/Makefile +++ b/Makefile @@ -1128,7 +1128,7 @@ firmware_install: export INSTALL_HDR_PATH = $(objtree)/usr # If we do an all arch process set dst to asm-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) PHONY += archheaders archheaders: @@ -1149,7 +1149,7 @@ headers_install: __headers $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all @@ -1158,7 +1158,7 @@ headers_check_all: headers_install_all PHONY += headers_check headers_check: headers_install $(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1 - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1 + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/ $(hdr-dst) HDRCHECK=1 # --------------------------------------------------------------------------- # Kernel selftest diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d0c5471856e0..b15bf6bc0e94 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -subdir-y += ../arch-v10/arch/ -subdir-y += ../arch-v32/arch/ diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index e0a50111e07f..0c74c3c5ebfa 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -2,5 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ucontext.h - -subdir-y += ../arch diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 122945618ae2..1aeb4f45208f 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -2,7 +2,7 @@ # Installing headers # # All headers under include/uapi, include/generated/uapi, -# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are # exported. # They are preprocessed to remove __KERNEL__ section of the file. # @@ -30,7 +30,6 @@ installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) subdirs := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/*/.)) -subdirs += $(subdir-y) header-files := $(notdir $(wildcard $(srcdir)/*.h)) header-files += $(notdir $(wildcard $(srcdir)/*.agh)) header-files := $(filter-out $(header-n), $(header-files)) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v6 8/8] uapi: export all arch specifics directories 2017-02-10 10:58 ` [PATCH v6 0/8] " Nicolas Dichtel ` (6 preceding siblings ...) 2017-02-10 10:58 ` [PATCH v6 7/8] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-02-10 10:58 ` Nicolas Dichtel 7 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-10 10:58 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel This patch removes the need of subdir-y. Now all files/directories under arch/<arch>/include/uapi/ are exported. The only change for userland is the layout of the command 'make headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. Those new directories contains all files/directories of the specified arch. Note that only cris and tile have more directories than only asm: - arch-v[10|32] for cris; - arch for tile. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 15 +-------------- Makefile | 6 +++--- arch/cris/include/uapi/asm/Kbuild | 3 --- arch/tile/include/uapi/asm/Kbuild | 2 -- scripts/Makefile.headersinst | 3 +-- 5 files changed, 5 insertions(+), 24 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 91ffb391ed54..223b33d5195a 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -49,7 +49,6 @@ This document describes the Linux kernel Makefiles. --- 7.3 generic-y --- 7.4 generated-y --- 7.5 mandatory-y - --- 7.6 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1265,7 +1264,7 @@ The pre-processing does: - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) All headers under include/uapi/, include/generated/uapi/, -arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/ are exported. A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and @@ -1338,18 +1337,6 @@ See subsequent chapter for the syntax of the Kbuild file. The convention is to list one subdir per line and preferably in alphabetic order. - --- 7.6 subdir-y - - subdir-y may be used to specify a subdirectory to be exported. - - Example: - #arch/cris/include/uapi/asm/Kbuild - subdir-y += ../arch-v10/arch/ - subdir-y += ../arch-v32/arch/ - - The convention is to list one subdir per line and - preferably in alphabetic order. - === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/Makefile b/Makefile index 8e223e081c9d..f9936b852280 100644 --- a/Makefile +++ b/Makefile @@ -1126,7 +1126,7 @@ firmware_install: export INSTALL_HDR_PATH = $(objtree)/usr # If we do an all arch process set dst to asm-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) PHONY += archheaders archheaders: @@ -1147,7 +1147,7 @@ headers_install: __headers $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all @@ -1156,7 +1156,7 @@ headers_check_all: headers_install_all PHONY += headers_check headers_check: headers_install $(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1 - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1 + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/ $(hdr-dst) HDRCHECK=1 # --------------------------------------------------------------------------- # Kernel selftest diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d0c5471856e0..b15bf6bc0e94 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -subdir-y += ../arch-v10/arch/ -subdir-y += ../arch-v32/arch/ diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index e0a50111e07f..0c74c3c5ebfa 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -2,5 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ucontext.h - -subdir-y += ../arch diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 122945618ae2..1aeb4f45208f 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -2,7 +2,7 @@ # Installing headers # # All headers under include/uapi, include/generated/uapi, -# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are # exported. # They are preprocessed to remove __KERNEL__ section of the file. # @@ -30,7 +30,6 @@ installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) subdirs := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/*/.)) -subdirs += $(subdir-y) header-files := $(notdir $(wildcard $(srcdir)/*.h)) header-files += $(notdir $(wildcard $(srcdir)/*.agh)) header-files := $(filter-out $(header-n), $(header-files)) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v5 8/8] uapi: export all arch specifics directories 2017-02-02 13:25 ` [PATCH v5 0/8] uapi: export all headers under uapi directories Nicolas Dichtel ` (6 preceding siblings ...) 2017-02-02 13:25 ` [PATCH v5 7/8] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-02-02 13:25 ` Nicolas Dichtel 2017-02-02 14:36 ` kbuild test robot 2017-02-02 14:46 ` kbuild test robot 7 siblings, 2 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-02-02 13:25 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel This patch removes the need of subdir-y. Now all files/directories under arch/<arch>/include/uapi/ are exported. The only change for userland is the layout of the command 'make headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. Those new directories contains all files/directories of the specified arch. Note that only cris and tile have more directories than only asm: - arch-v[10|32] for cris; - arch for tile. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 15 +-------------- Makefile | 4 ++-- arch/cris/include/uapi/asm/Kbuild | 3 --- arch/tile/include/uapi/asm/Kbuild | 2 -- scripts/Makefile.headersinst | 3 +-- 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 91ffb391ed54..223b33d5195a 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -49,7 +49,6 @@ This document describes the Linux kernel Makefiles. --- 7.3 generic-y --- 7.4 generated-y --- 7.5 mandatory-y - --- 7.6 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1265,7 +1264,7 @@ The pre-processing does: - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) All headers under include/uapi/, include/generated/uapi/, -arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/ are exported. A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and @@ -1338,18 +1337,6 @@ See subsequent chapter for the syntax of the Kbuild file. The convention is to list one subdir per line and preferably in alphabetic order. - --- 7.6 subdir-y - - subdir-y may be used to specify a subdirectory to be exported. - - Example: - #arch/cris/include/uapi/asm/Kbuild - subdir-y += ../arch-v10/arch/ - subdir-y += ../arch-v32/arch/ - - The convention is to list one subdir per line and - preferably in alphabetic order. - === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/Makefile b/Makefile index 96b27a888285..7c3183c32e08 100644 --- a/Makefile +++ b/Makefile @@ -1126,7 +1126,7 @@ firmware_install: export INSTALL_HDR_PATH = $(objtree)/usr # If we do an all arch process set dst to asm-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) PHONY += archheaders archheaders: @@ -1147,7 +1147,7 @@ headers_install: __headers $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d0c5471856e0..b15bf6bc0e94 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -subdir-y += ../arch-v10/arch/ -subdir-y += ../arch-v32/arch/ diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index e0a50111e07f..0c74c3c5ebfa 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -2,5 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ucontext.h - -subdir-y += ../arch diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index c96805a7f48b..0ee6b59403ca 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -2,7 +2,7 @@ # Installing headers # # All headers under include/uapi, include/generated/uapi, -# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are # exported. # They are preprocessed to remove __KERNEL__ section of the file. # @@ -28,7 +28,6 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) -subdirs += $(subdir-y) header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) header-files := $(filter-out $(header-n), $(header-files)) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v5 8/8] uapi: export all arch specifics directories 2017-02-02 13:25 ` [PATCH v5 " Nicolas Dichtel 2017-02-02 14:36 ` kbuild test robot @ 2017-02-02 14:36 ` kbuild test robot 1 sibling, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-02-02 14:36 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 5177 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc6] [cannot apply to next-20170202] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 config: ia64-allnoconfig (attached as .config) compiler: ia64-linux-gcc (GCC) 6.2.0 reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=ia64 All errors (new ones prefixed by >>): >> make[3]: *** No rule to make target 'usr/include/perfmon.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/break.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/fcntl.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/errno.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/ucontext.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/termios.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/posix_types.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/ioctls.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/signal.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/msgbuf.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/poll.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ustack.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/termbits.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/ipcbuf.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/swab.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/rse.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/resource.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/intel_intrin.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/fpu.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/sembuf.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ptrace_offsets.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/auxvec.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/mman.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/statfs.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/socket.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/perfmon_default_smpl.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/siginfo.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/param.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/sockios.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/intrinsics.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ia64regs.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/gcc_intrin.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/unistd.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/bitsperlong.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/byteorder.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/shmbuf.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/cmpxchg.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/stat.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/ioctl.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/setup.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/types.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/ptrace.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/sigcontext.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/kvm_para.h', needed by 'usr/include/.check'. make[3]: Target '__headerscheck' not remade because of errors. --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 5737 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v5 8/8] uapi: export all arch specifics directories @ 2017-02-02 14:36 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-02-02 14:36 UTC (permalink / raw) Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 5177 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc6] [cannot apply to next-20170202] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 config: ia64-allnoconfig (attached as .config) compiler: ia64-linux-gcc (GCC) 6.2.0 reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=ia64 All errors (new ones prefixed by >>): >> make[3]: *** No rule to make target 'usr/include/perfmon.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/break.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/fcntl.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/errno.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/ucontext.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/termios.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/posix_types.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/ioctls.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/signal.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/msgbuf.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/poll.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ustack.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/termbits.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/ipcbuf.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/swab.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/rse.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/resource.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/intel_intrin.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/fpu.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/sembuf.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ptrace_offsets.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/auxvec.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/mman.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/statfs.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/socket.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/perfmon_default_smpl.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/siginfo.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/param.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/sockios.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/intrinsics.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ia64regs.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/gcc_intrin.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/unistd.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/bitsperlong.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/byteorder.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/shmbuf.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/cmpxchg.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/stat.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/ioctl.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/setup.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/types.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/ptrace.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/sigcontext.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/kvm_para.h', needed by 'usr/include/.check'. make[3]: Target '__headerscheck' not remade because of errors. --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 5737 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v5 8/8] uapi: export all arch specifics directories @ 2017-02-02 14:36 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-02-02 14:36 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo [-- Attachment #1: Type: text/plain, Size: 5177 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc6] [cannot apply to next-20170202] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 config: ia64-allnoconfig (attached as .config) compiler: ia64-linux-gcc (GCC) 6.2.0 reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=ia64 All errors (new ones prefixed by >>): >> make[3]: *** No rule to make target 'usr/include/perfmon.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/break.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/fcntl.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/errno.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/ucontext.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/termios.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/posix_types.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/ioctls.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/signal.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/msgbuf.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/poll.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ustack.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/termbits.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/ipcbuf.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/swab.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/rse.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/resource.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/intel_intrin.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/fpu.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/sembuf.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ptrace_offsets.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/auxvec.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/mman.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/statfs.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/socket.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/perfmon_default_smpl.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/siginfo.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/param.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/sockios.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/intrinsics.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ia64regs.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/gcc_intrin.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/unistd.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/bitsperlong.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/byteorder.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/shmbuf.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/cmpxchg.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/stat.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/ioctl.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/setup.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/types.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/ptrace.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/sigcontext.h', needed by 'usr/include/.check'. make[3]: *** No rule to make target 'usr/include/kvm_para.h', needed by 'usr/include/.check'. make[3]: Target '__headerscheck' not remade because of errors. --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 5737 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v5 8/8] uapi: export all arch specifics directories 2017-02-02 13:25 ` [PATCH v5 " Nicolas Dichtel 2017-02-02 14:36 ` kbuild test robot @ 2017-02-02 14:46 ` kbuild test robot 1 sibling, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-02-02 14:46 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 2636 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc6] [cannot apply to next-20170202] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 config: x86_64-kexec (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): >> make[3]: *** No rule to make target 'usr/include/ldt.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/posix_types_x32.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/sembuf.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/e820.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/fcntl.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/errno.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/hyperv.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/resource.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ipcbuf.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/termios.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ucontext.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ist.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/vm86.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/param.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/msgbuf.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/prctl.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/msr.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ptrace-abi.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/termbits.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/swab.h', needed by 'usr/include/.check'. --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 24434 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v5 8/8] uapi: export all arch specifics directories @ 2017-02-02 14:46 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-02-02 14:46 UTC (permalink / raw) Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 2636 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc6] [cannot apply to next-20170202] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 config: x86_64-kexec (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): >> make[3]: *** No rule to make target 'usr/include/ldt.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/posix_types_x32.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/sembuf.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/e820.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/fcntl.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/errno.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/hyperv.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/resource.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ipcbuf.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/termios.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ucontext.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ist.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/vm86.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/param.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/msgbuf.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/prctl.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/msr.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ptrace-abi.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/termbits.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/swab.h', needed by 'usr/include/.check'. --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 24434 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v5 8/8] uapi: export all arch specifics directories @ 2017-02-02 14:46 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-02-02 14:46 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, mingo [-- Attachment #1: Type: text/plain, Size: 2636 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc6] [cannot apply to next-20170202] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170202-213944 config: x86_64-kexec (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): >> make[3]: *** No rule to make target 'usr/include/ldt.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/posix_types_x32.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/sembuf.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/e820.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/fcntl.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/errno.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/hyperv.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/resource.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ipcbuf.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/termios.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ucontext.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ist.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/vm86.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/param.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/msgbuf.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/prctl.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/msr.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/ptrace-abi.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/termbits.h', needed by 'usr/include/.check'. >> make[3]: *** No rule to make target 'usr/include/swab.h', needed by 'usr/include/.check'. --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 24434 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi 2017-01-23 14:58 ` [PATCH v4 3/7] x86: put msr-index.h " Nicolas Dichtel 2017-01-23 16:52 ` Borislav Petkov @ 2017-01-23 17:49 ` kbuild test robot 2017-01-23 19:11 ` kbuild test robot 2017-01-26 19:04 ` Ingo Molnar 3 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-01-23 17:49 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 3225 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc5 next-20170123] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170124-011935 config: i386-tinyconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): In file included from arch/x86/include/asm/processor.h:20:0, from arch/x86/include/asm/cpufeature.h:4, from arch/x86/include/asm/thread_info.h:52, from include/linux/thread_info.h:25, from arch/x86/include/asm/preempt.h:6, from include/linux/preempt.h:59, from include/linux/spinlock.h:50, from include/linux/mmzone.h:7, from include/linux/gfp.h:5, from include/linux/slab.h:14, from include/linux/crypto.h:24, from arch/x86/kernel/asm-offsets.c:8: >> arch/x86/include/asm/msr.h:4:23: fatal error: msr-index.h: No such file or directory #include "msr-index.h" ^ compilation terminated. make[2]: *** [arch/x86/kernel/asm-offsets.s] Error 1 make[2]: Target '__build' not remade because of errors. make[1]: *** [prepare0] Error 2 make[1]: Target 'prepare' not remade because of errors. make: *** [sub-make] Error 2 vim +4 arch/x86/include/asm/msr.h 1965aae3 arch/x86/include/asm/msr.h H. Peter Anvin 2008-10-22 1 #ifndef _ASM_X86_MSR_H 1965aae3 arch/x86/include/asm/msr.h H. Peter Anvin 2008-10-22 2 #define _ASM_X86_MSR_H be7baf80 include/asm-x86/msr.h Thomas Gleixner 2007-10-23 3 b72e7464 arch/x86/include/asm/msr.h Borislav Petkov 2015-06-04 @4 #include "msr-index.h" be7baf80 include/asm-x86/msr.h Thomas Gleixner 2007-10-23 5 8f12dea6 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 6 #ifndef __ASSEMBLY__ c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 7 c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 8 #include <asm/asm.h> c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 9 #include <asm/errno.h> 6bc1096d arch/x86/include/asm/msr.h Borislav Petkov 2009-05-22 10 #include <asm/cpumask.h> b72e7464 arch/x86/include/asm/msr.h Borislav Petkov 2015-06-04 11 #include <uapi/asm/msr.h> 6bc1096d arch/x86/include/asm/msr.h Borislav Petkov 2009-05-22 12 :::::: The code at line 4 was first introduced by commit :::::: b72e7464e4cf80117938e6adb8c22fdc1ca46d42 x86/uapi: Do not export <asm/msr-index.h> as part of the user API headers :::::: TO: Borislav Petkov <bp@suse.de> :::::: CC: Ingo Molnar <mingo@kernel.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 6397 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi @ 2017-01-23 17:49 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-01-23 17:49 UTC (permalink / raw) Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 3225 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc5 next-20170123] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170124-011935 config: i386-tinyconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): In file included from arch/x86/include/asm/processor.h:20:0, from arch/x86/include/asm/cpufeature.h:4, from arch/x86/include/asm/thread_info.h:52, from include/linux/thread_info.h:25, from arch/x86/include/asm/preempt.h:6, from include/linux/preempt.h:59, from include/linux/spinlock.h:50, from include/linux/mmzone.h:7, from include/linux/gfp.h:5, from include/linux/slab.h:14, from include/linux/crypto.h:24, from arch/x86/kernel/asm-offsets.c:8: >> arch/x86/include/asm/msr.h:4:23: fatal error: msr-index.h: No such file or directory #include "msr-index.h" ^ compilation terminated. make[2]: *** [arch/x86/kernel/asm-offsets.s] Error 1 make[2]: Target '__build' not remade because of errors. make[1]: *** [prepare0] Error 2 make[1]: Target 'prepare' not remade because of errors. make: *** [sub-make] Error 2 vim +4 arch/x86/include/asm/msr.h 1965aae3 arch/x86/include/asm/msr.h H. Peter Anvin 2008-10-22 1 #ifndef _ASM_X86_MSR_H 1965aae3 arch/x86/include/asm/msr.h H. Peter Anvin 2008-10-22 2 #define _ASM_X86_MSR_H be7baf80 include/asm-x86/msr.h Thomas Gleixner 2007-10-23 3 b72e7464 arch/x86/include/asm/msr.h Borislav Petkov 2015-06-04 @4 #include "msr-index.h" be7baf80 include/asm-x86/msr.h Thomas Gleixner 2007-10-23 5 8f12dea6 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 6 #ifndef __ASSEMBLY__ c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 7 c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 8 #include <asm/asm.h> c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 9 #include <asm/errno.h> 6bc1096d arch/x86/include/asm/msr.h Borislav Petkov 2009-05-22 10 #include <asm/cpumask.h> b72e7464 arch/x86/include/asm/msr.h Borislav Petkov 2015-06-04 11 #include <uapi/asm/msr.h> 6bc1096d arch/x86/include/asm/msr.h Borislav Petkov 2009-05-22 12 :::::: The code at line 4 was first introduced by commit :::::: b72e7464e4cf80117938e6adb8c22fdc1ca46d42 x86/uapi: Do not export <asm/msr-index.h> as part of the user API headers :::::: TO: Borislav Petkov <bp@suse.de> :::::: CC: Ingo Molnar <mingo@kernel.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 6397 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi @ 2017-01-23 17:49 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-01-23 17:49 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe [-- Attachment #1: Type: text/plain, Size: 3225 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc5 next-20170123] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170124-011935 config: i386-tinyconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): In file included from arch/x86/include/asm/processor.h:20:0, from arch/x86/include/asm/cpufeature.h:4, from arch/x86/include/asm/thread_info.h:52, from include/linux/thread_info.h:25, from arch/x86/include/asm/preempt.h:6, from include/linux/preempt.h:59, from include/linux/spinlock.h:50, from include/linux/mmzone.h:7, from include/linux/gfp.h:5, from include/linux/slab.h:14, from include/linux/crypto.h:24, from arch/x86/kernel/asm-offsets.c:8: >> arch/x86/include/asm/msr.h:4:23: fatal error: msr-index.h: No such file or directory #include "msr-index.h" ^ compilation terminated. make[2]: *** [arch/x86/kernel/asm-offsets.s] Error 1 make[2]: Target '__build' not remade because of errors. make[1]: *** [prepare0] Error 2 make[1]: Target 'prepare' not remade because of errors. make: *** [sub-make] Error 2 vim +4 arch/x86/include/asm/msr.h 1965aae3 arch/x86/include/asm/msr.h H. Peter Anvin 2008-10-22 1 #ifndef _ASM_X86_MSR_H 1965aae3 arch/x86/include/asm/msr.h H. Peter Anvin 2008-10-22 2 #define _ASM_X86_MSR_H be7baf80 include/asm-x86/msr.h Thomas Gleixner 2007-10-23 3 b72e7464 arch/x86/include/asm/msr.h Borislav Petkov 2015-06-04 @4 #include "msr-index.h" be7baf80 include/asm-x86/msr.h Thomas Gleixner 2007-10-23 5 8f12dea6 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 6 #ifndef __ASSEMBLY__ c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 7 c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 8 #include <asm/asm.h> c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 9 #include <asm/errno.h> 6bc1096d arch/x86/include/asm/msr.h Borislav Petkov 2009-05-22 10 #include <asm/cpumask.h> b72e7464 arch/x86/include/asm/msr.h Borislav Petkov 2015-06-04 11 #include <uapi/asm/msr.h> 6bc1096d arch/x86/include/asm/msr.h Borislav Petkov 2009-05-22 12 :::::: The code at line 4 was first introduced by commit :::::: b72e7464e4cf80117938e6adb8c22fdc1ca46d42 x86/uapi: Do not export <asm/msr-index.h> as part of the user API headers :::::: TO: Borislav Petkov <bp@suse.de> :::::: CC: Ingo Molnar <mingo@kernel.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 6397 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi 2017-01-23 14:58 ` [PATCH v4 3/7] x86: put msr-index.h " Nicolas Dichtel 2017-01-23 16:52 ` Borislav Petkov @ 2017-01-23 19:11 ` kbuild test robot 2017-01-23 19:11 ` kbuild test robot 2017-01-26 19:04 ` Ingo Molnar 3 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-01-23 19:11 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 4927 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc5 next-20170123] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170124-011935 config: x86_64-randconfig-s1-01240145 (attached as .config) compiler: gcc-4.4 (Debian 4.4.7-8) 4.4.7 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): In file included from arch/x86/include/asm/processor.h:20, from arch/x86/include/asm/cpufeature.h:4, from arch/x86/include/asm/thread_info.h:52, from include/linux/thread_info.h:25, from arch/x86/include/asm/preempt.h:6, from include/linux/preempt.h:59, from include/linux/spinlock.h:50, from include/linux/mmzone.h:7, from include/linux/gfp.h:5, from include/linux/slab.h:14, from include/linux/crypto.h:24, from arch/x86/kernel/asm-offsets.c:8: >> arch/x86/include/asm/msr.h:4:23: error: msr-index.h: No such file or directory In file included from arch/x86/include/asm/cpufeature.h:4, from arch/x86/include/asm/thread_info.h:52, from include/linux/thread_info.h:25, from arch/x86/include/asm/preempt.h:6, from include/linux/preempt.h:59, from include/linux/spinlock.h:50, from include/linux/mmzone.h:7, from include/linux/gfp.h:5, from include/linux/slab.h:14, from include/linux/crypto.h:24, from arch/x86/kernel/asm-offsets.c:8: arch/x86/include/asm/processor.h: In function 'get_debugctlmsr': >> arch/x86/include/asm/processor.h:719: error: 'MSR_IA32_DEBUGCTLMSR' undeclared (first use in this function) arch/x86/include/asm/processor.h:719: error: (Each undeclared identifier is reported only once arch/x86/include/asm/processor.h:719: error: for each function it appears in.) arch/x86/include/asm/processor.h: In function 'update_debugctlmsr': arch/x86/include/asm/processor.h:730: error: 'MSR_IA32_DEBUGCTLMSR' undeclared (first use in this function) In file included from arch/x86/include/asm/smp.h:12, from include/linux/smp.h:59, from include/linux/topology.h:33, from include/linux/gfp.h:8, from include/linux/slab.h:14, from include/linux/crypto.h:24, from arch/x86/kernel/asm-offsets.c:8: arch/x86/include/asm/apic.h: In function 'apic_is_x2apic_enabled': >> arch/x86/include/asm/apic.h:116: error: 'MSR_IA32_APICBASE' undeclared (first use in this function) At top level: cc1: warning: unrecognized command line option "-Wno-maybe-uninitialized" make[2]: *** [arch/x86/kernel/asm-offsets.s] Error 1 make[2]: Target '__build' not remade because of errors. make[1]: *** [prepare0] Error 2 make[1]: Target 'prepare' not remade because of errors. make: *** [sub-make] Error 2 vim +4 arch/x86/include/asm/msr.h 1965aae3 arch/x86/include/asm/msr.h H. Peter Anvin 2008-10-22 1 #ifndef _ASM_X86_MSR_H 1965aae3 arch/x86/include/asm/msr.h H. Peter Anvin 2008-10-22 2 #define _ASM_X86_MSR_H be7baf80 include/asm-x86/msr.h Thomas Gleixner 2007-10-23 3 b72e7464 arch/x86/include/asm/msr.h Borislav Petkov 2015-06-04 @4 #include "msr-index.h" be7baf80 include/asm-x86/msr.h Thomas Gleixner 2007-10-23 5 8f12dea6 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 6 #ifndef __ASSEMBLY__ c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 7 c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 8 #include <asm/asm.h> c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 9 #include <asm/errno.h> 6bc1096d arch/x86/include/asm/msr.h Borislav Petkov 2009-05-22 10 #include <asm/cpumask.h> b72e7464 arch/x86/include/asm/msr.h Borislav Petkov 2015-06-04 11 #include <uapi/asm/msr.h> 6bc1096d arch/x86/include/asm/msr.h Borislav Petkov 2009-05-22 12 :::::: The code at line 4 was first introduced by commit :::::: b72e7464e4cf80117938e6adb8c22fdc1ca46d42 x86/uapi: Do not export <asm/msr-index.h> as part of the user API headers :::::: TO: Borislav Petkov <bp@suse.de> :::::: CC: Ingo Molnar <mingo@kernel.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 34570 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi @ 2017-01-23 19:11 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-01-23 19:11 UTC (permalink / raw) Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 4927 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc5 next-20170123] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170124-011935 config: x86_64-randconfig-s1-01240145 (attached as .config) compiler: gcc-4.4 (Debian 4.4.7-8) 4.4.7 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): In file included from arch/x86/include/asm/processor.h:20, from arch/x86/include/asm/cpufeature.h:4, from arch/x86/include/asm/thread_info.h:52, from include/linux/thread_info.h:25, from arch/x86/include/asm/preempt.h:6, from include/linux/preempt.h:59, from include/linux/spinlock.h:50, from include/linux/mmzone.h:7, from include/linux/gfp.h:5, from include/linux/slab.h:14, from include/linux/crypto.h:24, from arch/x86/kernel/asm-offsets.c:8: >> arch/x86/include/asm/msr.h:4:23: error: msr-index.h: No such file or directory In file included from arch/x86/include/asm/cpufeature.h:4, from arch/x86/include/asm/thread_info.h:52, from include/linux/thread_info.h:25, from arch/x86/include/asm/preempt.h:6, from include/linux/preempt.h:59, from include/linux/spinlock.h:50, from include/linux/mmzone.h:7, from include/linux/gfp.h:5, from include/linux/slab.h:14, from include/linux/crypto.h:24, from arch/x86/kernel/asm-offsets.c:8: arch/x86/include/asm/processor.h: In function 'get_debugctlmsr': >> arch/x86/include/asm/processor.h:719: error: 'MSR_IA32_DEBUGCTLMSR' undeclared (first use in this function) arch/x86/include/asm/processor.h:719: error: (Each undeclared identifier is reported only once arch/x86/include/asm/processor.h:719: error: for each function it appears in.) arch/x86/include/asm/processor.h: In function 'update_debugctlmsr': arch/x86/include/asm/processor.h:730: error: 'MSR_IA32_DEBUGCTLMSR' undeclared (first use in this function) In file included from arch/x86/include/asm/smp.h:12, from include/linux/smp.h:59, from include/linux/topology.h:33, from include/linux/gfp.h:8, from include/linux/slab.h:14, from include/linux/crypto.h:24, from arch/x86/kernel/asm-offsets.c:8: arch/x86/include/asm/apic.h: In function 'apic_is_x2apic_enabled': >> arch/x86/include/asm/apic.h:116: error: 'MSR_IA32_APICBASE' undeclared (first use in this function) At top level: cc1: warning: unrecognized command line option "-Wno-maybe-uninitialized" make[2]: *** [arch/x86/kernel/asm-offsets.s] Error 1 make[2]: Target '__build' not remade because of errors. make[1]: *** [prepare0] Error 2 make[1]: Target 'prepare' not remade because of errors. make: *** [sub-make] Error 2 vim +4 arch/x86/include/asm/msr.h 1965aae3 arch/x86/include/asm/msr.h H. Peter Anvin 2008-10-22 1 #ifndef _ASM_X86_MSR_H 1965aae3 arch/x86/include/asm/msr.h H. Peter Anvin 2008-10-22 2 #define _ASM_X86_MSR_H be7baf80 include/asm-x86/msr.h Thomas Gleixner 2007-10-23 3 b72e7464 arch/x86/include/asm/msr.h Borislav Petkov 2015-06-04 @4 #include "msr-index.h" be7baf80 include/asm-x86/msr.h Thomas Gleixner 2007-10-23 5 8f12dea6 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 6 #ifndef __ASSEMBLY__ c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 7 c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 8 #include <asm/asm.h> c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 9 #include <asm/errno.h> 6bc1096d arch/x86/include/asm/msr.h Borislav Petkov 2009-05-22 10 #include <asm/cpumask.h> b72e7464 arch/x86/include/asm/msr.h Borislav Petkov 2015-06-04 11 #include <uapi/asm/msr.h> 6bc1096d arch/x86/include/asm/msr.h Borislav Petkov 2009-05-22 12 :::::: The code at line 4 was first introduced by commit :::::: b72e7464e4cf80117938e6adb8c22fdc1ca46d42 x86/uapi: Do not export <asm/msr-index.h> as part of the user API headers :::::: TO: Borislav Petkov <bp@suse.de> :::::: CC: Ingo Molnar <mingo@kernel.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 34570 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi @ 2017-01-23 19:11 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-01-23 19:11 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe [-- Attachment #1: Type: text/plain, Size: 4927 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc5 next-20170123] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170124-011935 config: x86_64-randconfig-s1-01240145 (attached as .config) compiler: gcc-4.4 (Debian 4.4.7-8) 4.4.7 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): In file included from arch/x86/include/asm/processor.h:20, from arch/x86/include/asm/cpufeature.h:4, from arch/x86/include/asm/thread_info.h:52, from include/linux/thread_info.h:25, from arch/x86/include/asm/preempt.h:6, from include/linux/preempt.h:59, from include/linux/spinlock.h:50, from include/linux/mmzone.h:7, from include/linux/gfp.h:5, from include/linux/slab.h:14, from include/linux/crypto.h:24, from arch/x86/kernel/asm-offsets.c:8: >> arch/x86/include/asm/msr.h:4:23: error: msr-index.h: No such file or directory In file included from arch/x86/include/asm/cpufeature.h:4, from arch/x86/include/asm/thread_info.h:52, from include/linux/thread_info.h:25, from arch/x86/include/asm/preempt.h:6, from include/linux/preempt.h:59, from include/linux/spinlock.h:50, from include/linux/mmzone.h:7, from include/linux/gfp.h:5, from include/linux/slab.h:14, from include/linux/crypto.h:24, from arch/x86/kernel/asm-offsets.c:8: arch/x86/include/asm/processor.h: In function 'get_debugctlmsr': >> arch/x86/include/asm/processor.h:719: error: 'MSR_IA32_DEBUGCTLMSR' undeclared (first use in this function) arch/x86/include/asm/processor.h:719: error: (Each undeclared identifier is reported only once arch/x86/include/asm/processor.h:719: error: for each function it appears in.) arch/x86/include/asm/processor.h: In function 'update_debugctlmsr': arch/x86/include/asm/processor.h:730: error: 'MSR_IA32_DEBUGCTLMSR' undeclared (first use in this function) In file included from arch/x86/include/asm/smp.h:12, from include/linux/smp.h:59, from include/linux/topology.h:33, from include/linux/gfp.h:8, from include/linux/slab.h:14, from include/linux/crypto.h:24, from arch/x86/kernel/asm-offsets.c:8: arch/x86/include/asm/apic.h: In function 'apic_is_x2apic_enabled': >> arch/x86/include/asm/apic.h:116: error: 'MSR_IA32_APICBASE' undeclared (first use in this function) At top level: cc1: warning: unrecognized command line option "-Wno-maybe-uninitialized" make[2]: *** [arch/x86/kernel/asm-offsets.s] Error 1 make[2]: Target '__build' not remade because of errors. make[1]: *** [prepare0] Error 2 make[1]: Target 'prepare' not remade because of errors. make: *** [sub-make] Error 2 vim +4 arch/x86/include/asm/msr.h 1965aae3 arch/x86/include/asm/msr.h H. Peter Anvin 2008-10-22 1 #ifndef _ASM_X86_MSR_H 1965aae3 arch/x86/include/asm/msr.h H. Peter Anvin 2008-10-22 2 #define _ASM_X86_MSR_H be7baf80 include/asm-x86/msr.h Thomas Gleixner 2007-10-23 3 b72e7464 arch/x86/include/asm/msr.h Borislav Petkov 2015-06-04 @4 #include "msr-index.h" be7baf80 include/asm-x86/msr.h Thomas Gleixner 2007-10-23 5 8f12dea6 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 6 #ifndef __ASSEMBLY__ c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 7 c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 8 #include <asm/asm.h> c210d249 include/asm-x86/msr.h Glauber de Oliveira Costa 2008-01-30 9 #include <asm/errno.h> 6bc1096d arch/x86/include/asm/msr.h Borislav Petkov 2009-05-22 10 #include <asm/cpumask.h> b72e7464 arch/x86/include/asm/msr.h Borislav Petkov 2015-06-04 11 #include <uapi/asm/msr.h> 6bc1096d arch/x86/include/asm/msr.h Borislav Petkov 2009-05-22 12 :::::: The code at line 4 was first introduced by commit :::::: b72e7464e4cf80117938e6adb8c22fdc1ca46d42 x86/uapi: Do not export <asm/msr-index.h> as part of the user API headers :::::: TO: Borislav Petkov <bp@suse.de> :::::: CC: Ingo Molnar <mingo@kernel.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 34570 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi 2017-01-23 14:58 ` [PATCH v4 3/7] x86: put msr-index.h " Nicolas Dichtel ` (2 preceding siblings ...) 2017-01-23 19:11 ` kbuild test robot @ 2017-01-26 19:04 ` Ingo Molnar 2017-01-26 19:29 ` Borislav Petkov 3 siblings, 1 reply; 554+ messages in thread From: Ingo Molnar @ 2017-01-26 19:04 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe * Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This header file is exported, thus move it to uapi. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > arch/x86/include/asm/msr-index.h | 698 ---------------------------------- > arch/x86/include/uapi/asm/msr-index.h | 698 ++++++++++++++++++++++++++++++++++ For the reasons Boris outlined: NAKed-by: Ingo Molnar <mingo@kernel.org> Please remove this patch from linux-next as well, until you get an Acked-by from an x86 maintainer. Thanks, Ingo ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 3/7] x86: put msr-index.h in uapi 2017-01-26 19:04 ` Ingo Molnar @ 2017-01-26 19:29 ` Borislav Petkov 0 siblings, 0 replies; 554+ messages in thread From: Borislav Petkov @ 2017-01-26 19:29 UTC (permalink / raw) To: Ingo Molnar Cc: Nicolas Dichtel, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe On Thu, Jan 26, 2017 at 08:04:52PM +0100, Ingo Molnar wrote: > Please remove this patch from linux-next as well, until you get an > Acked-by from an x86 maintainer. ... and the header export from arch/x86/include/uapi/asm/Kbuild too pls. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v4 4/7] Makefile.headersinst: cleanup input files 2017-01-23 14:58 ` [PATCH v4 0/7] uapi: export all headers under uapi directories Nicolas Dichtel ` (2 preceding siblings ...) 2017-01-23 14:58 ` [PATCH v4 3/7] x86: put msr-index.h " Nicolas Dichtel @ 2017-01-23 14:58 ` Nicolas Dichtel 2017-01-23 14:58 ` [PATCH v4 5/7] Makefile.headersinst: remove destination-y option Nicolas Dichtel ` (2 subsequent siblings) 6 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-23 14:58 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, Nicolas Dichtel After the last four patches, all exported headers are under uapi/, thus input-files2 are not needed anymore. The side effect is that input-files1-name is exactly header-y. Note also that input-files3-name is genhdr-y. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- scripts/Makefile.headersinst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 1106d6ca3a38..3e20d03432d2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -40,31 +40,20 @@ wrapper-files := $(filter $(header-y), $(generic-y)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) -oldsrcdir := $(srctree)/$(subst /uapi,,$(obj)) - # all headers files for this dir header-y := $(filter-out $(generic-y), $(header-y)) all-files := $(header-y) $(genhdr-y) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -input-files1 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)), \ - $(wildcard $(srcdir)/$(hdr))) \ - ) -input-files1-name := $(notdir $(input-files1)) -input-files2 := $(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(if $(wildcard $(oldsrcdir)/$(hdr)), \ - $(wildcard $(oldsrcdir)/$(hdr)), \ - $(error Missing UAPI file $(srcdir)/$(hdr))) \ - )) -input-files2-name := $(notdir $(input-files2)) -input-files3 := $(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)), \ - $(wildcard $(gendir)/$(hdr)), \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) -input-files3-name := $(notdir $(input-files3)) +# Check that all expected files exist +$(foreach hdr, $(header-y), \ + $(if $(wildcard $(srcdir)/$(hdr)),, \ + $(error Missing UAPI file $(srcdir)/$(hdr)) \ + )) +$(foreach hdr, $(genhdr-y), \ + $(if $(wildcard $(gendir)/$(hdr)),, \ + $(error Missing generated UAPI file $(gendir)/$(hdr)) \ + )) # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -78,9 +67,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \ - $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v4 5/7] Makefile.headersinst: remove destination-y option 2017-01-23 14:58 ` [PATCH v4 0/7] uapi: export all headers under uapi directories Nicolas Dichtel ` (3 preceding siblings ...) 2017-01-23 14:58 ` [PATCH v4 4/7] Makefile.headersinst: cleanup input files Nicolas Dichtel @ 2017-01-23 14:58 ` Nicolas Dichtel 2017-01-23 14:58 ` [PATCH v4 6/7] uapi: export all headers under uapi directories Nicolas Dichtel 2017-01-23 14:58 ` [PATCH v4 7/7] uapi: export all arch specifics directories Nicolas Dichtel 6 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-23 14:58 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, Nicolas Dichtel This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y for exported headers") but never used in-tree. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 23 ++++------------------- scripts/Makefile.headersinst | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 9b9c4797fc55..37b525d329ae 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles. === 7 Kbuild syntax for exported headers --- 7.1 header-y --- 7.2 genhdr-y - --- 7.3 destination-y - --- 7.4 generic-y - --- 7.5 generated-y + --- 7.3 generic-y + --- 7.4 generated-y === 8 Kbuild Variables === 9 Makefile language @@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file. #include/linux/Kbuild genhdr-y += version.h - --- 7.3 destination-y - - When an architecture has a set of exported headers that needs to be - exported to a different directory destination-y is used. - destination-y specifies the destination directory for all exported - headers in the file where it is present. - - Example: - #arch/xtensa/platforms/s6105/include/platform/Kbuild - destination-y := include/linux - - In the example above all exported headers in the Kbuild file - will be located in the directory "include/linux" when exported. - - --- 7.4 generic-y + --- 7.3 generic-y If an architecture uses a verbatim copy of a header from include/asm-generic then this is listed in the file @@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file. Example: termios.h #include <asm-generic/termios.h> - --- 7.5 generated-y + --- 7.4 generated-y If an architecture generates other header files alongside generic-y wrappers, and not included in genhdr-y, then generated-y specifies diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 3e20d03432d2..876b42cfede4 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) # called may set destination dir (when installing to asm/) -_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj))) +_dst := $(if $(dst),$(dst),$(obj)) old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild ifneq ($(wildcard $(old-kbuild-file)),) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v4 6/7] uapi: export all headers under uapi directories 2017-01-23 14:58 ` [PATCH v4 0/7] uapi: export all headers under uapi directories Nicolas Dichtel ` (4 preceding siblings ...) 2017-01-23 14:58 ` [PATCH v4 5/7] Makefile.headersinst: remove destination-y option Nicolas Dichtel @ 2017-01-23 14:58 ` Nicolas Dichtel 2017-01-23 15:25 ` Christoph Hellwig ` (2 more replies) 2017-01-23 14:58 ` [PATCH v4 7/7] uapi: export all arch specifics directories Nicolas Dichtel 6 siblings, 3 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-23 14:58 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, Nicolas Dichtel Regularly, when a new header is created in include/uapi/, the developer forgets to add it in the corresponding Kbuild file. This error is usually detected after the release is out. In fact, all headers under uapi directories should be exported, thus it's useless to have an exhaustive list. After this patch, the following files, which were not exported, are now exported (with make headers_install_all): asm-unicore32/shmparam.h asm-unicore32/ucontext.h asm-hexagon/shmparam.h asm-mips/ucontext.h asm-mips/hwcap.h asm-mips/reg.h drm/vgem_drm.h drm/armada_drm.h drm/omap_drm.h drm/etnaviv_drm.h asm-tile/shmparam.h asm-blackfin/shmparam.h asm-blackfin/ucontext.h asm-powerpc/perf_regs.h rdma/qedr-abi.h asm-parisc/kvm_para.h asm-openrisc/shmparam.h .install asm-nios2/kvm_para.h asm-nios2/ucontext.h asm-sh/kvm_para.h asm-sh/ucontext.h asm-xtensa/kvm_para.h asm-avr32/kvm_para.h asm-m32r/kvm_para.h asm-h8300/shmparam.h asm-h8300/ucontext.h asm-metag/kvm_para.h asm-metag/shmparam.h asm-metag/ucontext.h asm-m68k/kvm_para.h asm-m68k/shmparam.h linux/bcache.h linux/kvm.h linux/kvm_para.h linux/kfd_ioctl.h linux/cryptouser.h linux/kcm.h linux/kcov.h linux/seg6_iptunnel.h linux/stm.h linux/genwqe linux/genwqe/.install linux/genwqe/genwqe_card.h linux/genwqe/..install.cmd linux/seg6.h linux/cifs linux/cifs/.install linux/cifs/cifs_mount.h linux/cifs/..install.cmd linux/auto_dev-ioctl.h linux/userio.h linux/pr.h linux/wil6210_uapi.h linux/a.out.h linux/nilfs2_ondisk.h linux/hash_info.h linux/seg6_genl.h linux/seg6_hmac.h linux/batman_adv.h linux/nsfs.h linux/qrtr.h linux/btrfs_tree.h linux/coresight-stm.h linux/dma-buf.h linux/module.h linux/lightnvm.h linux/nilfs2_api.h asm-cris/kvm_para.h asm-arc/kvm_para.h asm-arc/ucontext.h ..install.cmd asm-c6x/shmparam.h asm-c6x/ucontext.h Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all subdirs with a pure makefile command. For the record, note that exported files for asm directories are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/<arch>/include/uapi/asm/Kbuild; - arch/<arch>/include/asm/Kbuild. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Mark Salter <msalter@redhat.com> Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) --- Documentation/kbuild/makefiles.txt | 55 ++-- arch/alpha/include/uapi/asm/Kbuild | 41 --- arch/arc/include/uapi/asm/Kbuild | 3 - arch/arm/include/uapi/asm/Kbuild | 17 - arch/arm64/include/uapi/asm/Kbuild | 18 -- arch/avr32/include/uapi/asm/Kbuild | 20 -- arch/blackfin/include/uapi/asm/Kbuild | 17 - arch/c6x/include/uapi/asm/Kbuild | 8 - arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - arch/cris/include/uapi/asm/Kbuild | 43 +-- arch/frv/include/uapi/asm/Kbuild | 33 -- arch/h8300/include/uapi/asm/Kbuild | 28 -- arch/hexagon/include/asm/Kbuild | 3 - arch/hexagon/include/uapi/asm/Kbuild | 13 - arch/ia64/include/uapi/asm/Kbuild | 45 --- arch/m32r/include/uapi/asm/Kbuild | 31 -- arch/m68k/include/uapi/asm/Kbuild | 24 -- arch/metag/include/uapi/asm/Kbuild | 8 - arch/microblaze/include/uapi/asm/Kbuild | 32 -- arch/mips/include/uapi/asm/Kbuild | 37 --- arch/mn10300/include/uapi/asm/Kbuild | 32 -- arch/nios2/include/uapi/asm/Kbuild | 3 +- arch/openrisc/include/asm/Kbuild | 3 - arch/openrisc/include/uapi/asm/Kbuild | 8 - arch/parisc/include/uapi/asm/Kbuild | 28 -- arch/powerpc/include/uapi/asm/Kbuild | 45 --- arch/s390/include/uapi/asm/Kbuild | 52 --- arch/score/include/asm/Kbuild | 4 - arch/score/include/uapi/asm/Kbuild | 32 -- arch/sh/include/uapi/asm/Kbuild | 23 -- arch/sparc/include/uapi/asm/Kbuild | 48 --- arch/tile/include/asm/Kbuild | 3 - arch/tile/include/uapi/arch/Kbuild | 17 - arch/tile/include/uapi/asm/Kbuild | 19 +- arch/unicore32/include/uapi/asm/Kbuild | 6 - arch/x86/include/uapi/asm/Kbuild | 59 ---- arch/xtensa/include/uapi/asm/Kbuild | 23 -- include/Kbuild | 2 - include/asm-generic/Kbuild.asm | 1 - include/scsi/fc/Kbuild | 0 include/uapi/Kbuild | 15 - include/uapi/asm-generic/Kbuild | 36 --- include/uapi/asm-generic/Kbuild.asm | 62 ++-- include/uapi/drm/Kbuild | 22 -- include/uapi/linux/Kbuild | 483 ---------------------------- include/uapi/linux/android/Kbuild | 2 - include/uapi/linux/byteorder/Kbuild | 3 - include/uapi/linux/caif/Kbuild | 3 - include/uapi/linux/can/Kbuild | 6 - include/uapi/linux/dvb/Kbuild | 9 - include/uapi/linux/hdlc/Kbuild | 2 - include/uapi/linux/hsi/Kbuild | 2 - include/uapi/linux/iio/Kbuild | 3 - include/uapi/linux/isdn/Kbuild | 2 - include/uapi/linux/mmc/Kbuild | 2 - include/uapi/linux/netfilter/Kbuild | 89 ----- include/uapi/linux/netfilter/ipset/Kbuild | 5 - include/uapi/linux/netfilter_arp/Kbuild | 3 - include/uapi/linux/netfilter_bridge/Kbuild | 18 -- include/uapi/linux/netfilter_ipv4/Kbuild | 10 - include/uapi/linux/netfilter_ipv6/Kbuild | 13 - include/uapi/linux/nfsd/Kbuild | 6 - include/uapi/linux/raid/Kbuild | 3 - include/uapi/linux/spi/Kbuild | 2 - include/uapi/linux/sunrpc/Kbuild | 2 - include/uapi/linux/tc_act/Kbuild | 15 - include/uapi/linux/tc_ematch/Kbuild | 5 - include/uapi/linux/usb/Kbuild | 12 - include/uapi/linux/wimax/Kbuild | 2 - include/uapi/misc/Kbuild | 2 - include/uapi/mtd/Kbuild | 6 - include/uapi/rdma/Kbuild | 18 -- include/uapi/rdma/hfi/Kbuild | 2 - include/uapi/scsi/Kbuild | 6 - include/uapi/scsi/fc/Kbuild | 5 - include/uapi/sound/Kbuild | 16 - include/uapi/video/Kbuild | 4 - include/uapi/xen/Kbuild | 5 - include/video/Kbuild | 0 scripts/Makefile.headersinst | 45 +-- 81 files changed, 92 insertions(+), 1746 deletions(-) delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild delete mode 100644 arch/tile/include/uapi/arch/Kbuild delete mode 100644 include/Kbuild delete mode 100644 include/asm-generic/Kbuild.asm delete mode 100644 include/scsi/fc/Kbuild delete mode 100644 include/uapi/Kbuild delete mode 100644 include/uapi/asm-generic/Kbuild delete mode 100644 include/uapi/drm/Kbuild delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/android/Kbuild delete mode 100644 include/uapi/linux/byteorder/Kbuild delete mode 100644 include/uapi/linux/caif/Kbuild delete mode 100644 include/uapi/linux/can/Kbuild delete mode 100644 include/uapi/linux/dvb/Kbuild delete mode 100644 include/uapi/linux/hdlc/Kbuild delete mode 100644 include/uapi/linux/hsi/Kbuild delete mode 100644 include/uapi/linux/iio/Kbuild delete mode 100644 include/uapi/linux/isdn/Kbuild delete mode 100644 include/uapi/linux/mmc/Kbuild delete mode 100644 include/uapi/linux/netfilter/Kbuild delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild delete mode 100644 include/uapi/linux/nfsd/Kbuild delete mode 100644 include/uapi/linux/raid/Kbuild delete mode 100644 include/uapi/linux/spi/Kbuild delete mode 100644 include/uapi/linux/sunrpc/Kbuild delete mode 100644 include/uapi/linux/tc_act/Kbuild delete mode 100644 include/uapi/linux/tc_ematch/Kbuild delete mode 100644 include/uapi/linux/usb/Kbuild delete mode 100644 include/uapi/linux/wimax/Kbuild delete mode 100644 include/uapi/misc/Kbuild delete mode 100644 include/uapi/mtd/Kbuild delete mode 100644 include/uapi/rdma/Kbuild delete mode 100644 include/uapi/rdma/hfi/Kbuild delete mode 100644 include/uapi/scsi/Kbuild delete mode 100644 include/uapi/scsi/fc/Kbuild delete mode 100644 include/uapi/sound/Kbuild delete mode 100644 include/uapi/video/Kbuild delete mode 100644 include/uapi/xen/Kbuild delete mode 100644 include/video/Kbuild diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 37b525d329ae..51c072049e45 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -44,10 +44,11 @@ This document describes the Linux kernel Makefiles. --- 6.11 Post-link pass === 7 Kbuild syntax for exported headers - --- 7.1 header-y + --- 7.1 mandatory-y --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y + --- 7.5 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1235,7 +1236,7 @@ When kbuild executes, the following steps are followed (roughly): that may be shared between individual architectures. The recommended approach how to use a generic header file is to list the file in the Kbuild file. - See "7.4 generic-y" for further info on syntax etc. + See "7.3 generic-y" for further info on syntax etc. --- 6.11 Post-link pass @@ -1262,37 +1263,33 @@ The pre-processing does: - drop include of compiler.h - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) -Each relevant directory contains a file name "Kbuild" which specifies the -headers to be exported. -See subsequent chapter for the syntax of the Kbuild file. +All headers under include/uapi/, include/generated/uapi/, +arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +are exported. - --- 7.1 header-y +A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and +arch/<arch>/include/asm/ to list asm files coming from asm-generic. +See subsequent chapter for the syntax of the Kbuild file. - header-y specifies header files to be exported. + --- 7.1 mandatory-y - Example: - #include/linux/Kbuild - header-y += usb/ - header-y += aio_abi.h + mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm + to define the minimun set of headers that must be exported in + include/asm. - The convention is to list one file per line and + The convention is to list one subdir per line and preferably in alphabetic order. - header-y also specifies which subdirectories to visit. - A subdirectory is identified by a trailing '/' which - can be seen in the example above for the usb subdirectory. - - Subdirectories are visited before their parent directories. - --- 7.2 genhdr-y - genhdr-y specifies generated files to be exported. - Generated files are special as they need to be looked - up in another directory when doing 'make O=...' builds. + genhdr-y specifies asm files to be generated. Example: - #include/linux/Kbuild - genhdr-y += version.h + #arch/x86/include/uapi/asm/Kbuild + genhdr-y += unistd_32.h + genhdr-y += unistd_64.h + genhdr-y += unistd_x32.h + --- 7.3 generic-y @@ -1334,6 +1331,18 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h + --- 7.5 subdir-y + + subdir-y may be used to specify a subdirectory to be exported. + + Example: + #arch/cris/include/uapi/asm/Kbuild + subdir-y += ../arch-v10/arch/ + subdir-y += ../arch-v32/arch/ + + The convention is to list one subdir per line and + preferably in alphabetic order. + === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index d96f2ef5b639..b15bf6bc0e94 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -1,43 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += compiler.h -header-y += console.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gentrap.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += pal.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += reg.h -header-y += regdef.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 += sysinfo.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild index f50d02df78d5..b15bf6bc0e94 100644 --- a/arch/arc/include/uapi/asm/Kbuild +++ b/arch/arc/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h -header-y += page.h -header-y += cachectl.h diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild index 46a76cd6acb6..607f702c2d62 100644 --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@ -1,23 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += mman.h -header-y += perf_regs.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += unistd.h genhdr-y += unistd-common.h genhdr-y += unistd-oabi.h genhdr-y += unistd-eabi.h diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index 825b0fe51c2b..13a97aa2285f 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -2,21 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += fcntl.h -header-y += hwcap.h -header-y += kvm_para.h -header-y += perf_regs.h -header-y += param.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += statfs.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index 08d8a3d76ea8..610395083364 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild @@ -1,26 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += msgbuf.h -header-y += param.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h generic-y += bitsperlong.h generic-y += errno.h generic-y += fcntl.h diff --git a/arch/blackfin/include/uapi/asm/Kbuild b/arch/blackfin/include/uapi/asm/Kbuild index 0bd28f77abc3..b15bf6bc0e94 100644 --- a/arch/blackfin/include/uapi/asm/Kbuild +++ b/arch/blackfin/include/uapi/asm/Kbuild @@ -1,19 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bfin_sport.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += fixed_code.h -header-y += ioctls.h -header-y += kvm_para.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild index e9bc2b2b8147..13a97aa2285f 100644 --- a/arch/c6x/include/uapi/asm/Kbuild +++ b/arch/c6x/include/uapi/asm/Kbuild @@ -2,11 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/cris/include/uapi/arch-v10/arch/Kbuild b/arch/cris/include/uapi/arch-v10/arch/Kbuild deleted file mode 100644 index 9048c87a782b..000000000000 --- a/arch/cris/include/uapi/arch-v10/arch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += sv_addr.agh -header-y += sv_addr_ag.h -header-y += svinto.h -header-y += user.h diff --git a/arch/cris/include/uapi/arch-v32/arch/Kbuild b/arch/cris/include/uapi/arch-v32/arch/Kbuild deleted file mode 100644 index 59efffd16b61..000000000000 --- a/arch/cris/include/uapi/arch-v32/arch/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += cryptocop.h -header-y += user.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d5564a0ae66a..d0c5471856e0 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,44 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += ../arch-v10/arch/ -header-y += ../arch-v32/arch/ -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += elf_v10.h -header-y += elf_v32.h -header-y += errno.h -header-y += ethernet.h -header-y += etraxgpio.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 += ptrace_v10.h -header-y += ptrace_v32.h -header-y += resource.h -header-y += rs485.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 += sync_serial.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h +subdir-y += ../arch-v10/arch/ +subdir-y += ../arch-v32/arch/ diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild index 42a2b33461c0..b15bf6bc0e94 100644 --- a/arch/frv/include/uapi/asm/Kbuild +++ b/arch/frv/include/uapi/asm/Kbuild @@ -1,35 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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 += registers.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/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild index fb6101a5d4f1..b15bf6bc0e94 100644 --- a/arch/h8300/include/uapi/asm/Kbuild +++ b/arch/h8300/include/uapi/asm/Kbuild @@ -1,30 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += siginfo.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/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index db8ddabc6bd2..f3b1ceb5c1e4 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += auxvec.h generic-y += barrier.h generic-y += bug.h diff --git a/arch/hexagon/include/uapi/asm/Kbuild b/arch/hexagon/include/uapi/asm/Kbuild index c31706c38631..b15bf6bc0e94 100644 --- a/arch/hexagon/include/uapi/asm/Kbuild +++ b/arch/hexagon/include/uapi/asm/Kbuild @@ -1,15 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += bitsperlong.h -header-y += byteorder.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += registers.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += swab.h -header-y += unistd.h -header-y += user.h diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 891002bbb995..13a97aa2285f 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,48 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += kvm_para.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cmpxchg.h -header-y += errno.h -header-y += fcntl.h -header-y += fpu.h -header-y += gcc_intrin.h -header-y += ia64regs.h -header-y += intel_intrin.h -header-y += intrinsics.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += perfmon.h -header-y += perfmon_default_smpl.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += ptrace_offsets.h -header-y += resource.h -header-y += rse.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 += ucontext.h -header-y += unistd.h -header-y += ustack.h diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 6a2d257bdfb2..64368077235a 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -9,27 +9,3 @@ generic-y += socket.h generic-y += sockios.h generic-y += termbits.h generic-y += termios.h - -header-y += a.out.h -header-y += bootinfo.h -header-y += bootinfo-amiga.h -header-y += bootinfo-apollo.h -header-y += bootinfo-atari.h -header-y += bootinfo-hp300.h -header-y += bootinfo-mac.h -header-y += bootinfo-q40.h -header-y += bootinfo-vme.h -header-y += byteorder.h -header-y += cachectl.h -header-y += fcntl.h -header-y += ioctls.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += unistd.h diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild index ab78be2b6eb0..b29731ebd7a9 100644 --- a/arch/metag/include/uapi/asm/Kbuild +++ b/arch/metag/include/uapi/asm/Kbuild @@ -1,14 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += ech.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += swab.h -header-y += unistd.h - generic-y += mman.h generic-y += resource.h generic-y += setup.h diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild index 1aac99f87df1..2178c78c7c1a 100644 --- a/arch/microblaze/include/uapi/asm/Kbuild +++ b/arch/microblaze/include/uapi/asm/Kbuild @@ -2,35 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += types.h - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += elf.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.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 += unistd.h diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild index f2cf41461146..a0266feba9e6 100644 --- a/arch/mips/include/uapi/asm/Kbuild +++ b/arch/mips/include/uapi/asm/Kbuild @@ -2,40 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ipcbuf.h - -header-y += auxvec.h -header-y += bitfield.h -header-y += bitsperlong.h -header-y += break.h -header-y += byteorder.h -header-y += cachectl.h -header-y += errno.h -header-y += fcntl.h -header-y += inst.h -header-y += ioctl.h -header-y += ioctls.h -header-y += kvm_para.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 += sgidefs.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 += sysmips.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/mn10300/include/uapi/asm/Kbuild +++ b/arch/mn10300/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 69c965304146..374bd123329f 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,6 +1,5 @@ +# UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += elf.h - generic-y += setup.h generic-y += ucontext.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 2832f031fb11..561915716fd9 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ucontext.h - generic-y += atomic.h generic-y += auxvec.h generic-y += barrier.h diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild index 80761eb82b5f..b15bf6bc0e94 100644 --- a/arch/openrisc/include/uapi/asm/Kbuild +++ b/arch/openrisc/include/uapi/asm/Kbuild @@ -1,10 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += byteorder.h -header-y += elf.h -header-y += kvm_para.h -header-y += param.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 348356c99514..3971c60a7e7f 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -2,31 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += resource.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 += pdc.h -header-y += posix_types.h -header-y += ptrace.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/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index dab3717e3ea0..b15bf6bc0e94 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -1,47 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += bootx.h -header-y += byteorder.h -header-y += cputable.h -header-y += eeh.h -header-y += elf.h -header-y += epapr_hcalls.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += nvram.h -header-y += opal-prd.h -header-y += param.h -header-y += perf_event.h -header-y += poll.h -header-y += posix_types.h -header-y += ps3fb.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 += spu_info.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += tm.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild index bf736e764cb4..b15bf6bc0e94 100644 --- a/arch/s390/include/uapi/asm/Kbuild +++ b/arch/s390/include/uapi/asm/Kbuild @@ -1,54 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += chpid.h -header-y += chsc.h -header-y += clp.h -header-y += cmb.h -header-y += dasd.h -header-y += debug.h -header-y += errno.h -header-y += fcntl.h -header-y += hypfs.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += kvm_virtio.h -header-y += mman.h -header-y += monwriter.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += qeth.h -header-y += resource.h -header-y += schid.h -header-y += sclp_ctl.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sie.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 += tape390.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += virtio-ccw.h -header-y += vtoc.h -header-y += zcrypt.h diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index a05218ff3fe4..128ca7ec0220 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,7 +1,3 @@ - -header-y += - - generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index 040178cdb3eb..b15bf6bc0e94 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,34 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.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 += kvm_para.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/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild index 60613ae78513..b15bf6bc0e94 100644 --- a/arch/sh/include/uapi/asm/Kbuild +++ b/arch/sh/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.h -header-y += cachectl.h -header-y += cpu-features.h -header-y += hw_breakpoint.h -header-y += ioctls.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += ptrace.h -header-y += ptrace_32.h -header-y += ptrace_64.h -header-y += setup.h -header-y += sigcontext.h -header-y += signal.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += types.h -header-y += unistd.h -header-y += unistd_32.h -header-y += unistd_64.h diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index b5843ee09fb5..b15bf6bc0e94 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -1,50 +1,2 @@ # UAPI Header export list -# User exported sparc header files - include include/uapi/asm-generic/Kbuild.asm - -header-y += apc.h -header-y += asi.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += display7seg.h -header-y += envctrl.h -header-y += errno.h -header-y += fbio.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += jsflash.h -header-y += kvm_para.h -header-y += mman.h -header-y += msgbuf.h -header-y += openpromio.h -header-y += param.h -header-y += perfctr.h -header-y += poll.h -header-y += posix_types.h -header-y += psr.h -header-y += psrcompat.h -header-y += pstate.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 += traps.h -header-y += uctx.h -header-y += unistd.h -header-y += utrap.h -header-y += watchdog.h diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 2d1f5638974c..057eaa533877 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -1,6 +1,3 @@ - -header-y += ../arch/ - generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild deleted file mode 100644 index 97dfbecec6b6..000000000000 --- a/arch/tile/include/uapi/arch/Kbuild +++ /dev/null @@ -1,17 +0,0 @@ -# UAPI Header export list -header-y += abi.h -header-y += chip.h -header-y += chip_tilegx.h -header-y += chip_tilepro.h -header-y += icache.h -header-y += interrupts.h -header-y += interrupts_32.h -header-y += interrupts_64.h -header-y += opcode.h -header-y += opcode_tilegx.h -header-y += opcode_tilepro.h -header-y += sim.h -header-y += sim_def.h -header-y += spr_def.h -header-y += spr_def_32.h -header-y += spr_def_64.h diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index c20db8e428bf..e0a50111e07f 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -1,21 +1,6 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += cachectl.h -header-y += hardwall.h -header-y += kvm_para.h -header-y += mman.h -header-y += ptrace.h -header-y += setup.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += stat.h -header-y += swab.h -header-y += ucontext.h -header-y += unistd.h - generic-y += ucontext.h + +subdir-y += ../arch diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild index 0514d7ad6855..13a97aa2285f 100644 --- a/arch/unicore32/include/uapi/asm/Kbuild +++ b/arch/unicore32/include/uapi/asm/Kbuild @@ -1,10 +1,4 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += byteorder.h -header-y += kvm_para.h -header-y += ptrace.h -header-y += sigcontext.h -header-y += unistd.h - generic-y += kvm_para.h diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 3dec769cadf7..83b6e9a0dce4 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -4,62 +4,3 @@ include include/uapi/asm-generic/Kbuild.asm genhdr-y += unistd_32.h genhdr-y += unistd_64.h genhdr-y += unistd_x32.h -header-y += a.out.h -header-y += auxvec.h -header-y += bitsperlong.h -header-y += boot.h -header-y += bootparam.h -header-y += byteorder.h -header-y += debugreg.h -header-y += e820.h -header-y += errno.h -header-y += fcntl.h -header-y += hw_breakpoint.h -header-y += hyperv.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += ist.h -header-y += kvm.h -header-y += kvm_para.h -header-y += kvm_perf.h -header-y += ldt.h -header-y += mce.h -header-y += mman.h -header-y += msgbuf.h -header-y += msr-index.h -header-y += msr.h -header-y += mtrr.h -header-y += param.h -header-y += perf_regs.h -header-y += poll.h -header-y += posix_types.h -header-y += posix_types_32.h -header-y += posix_types_64.h -header-y += posix_types_x32.h -header-y += prctl.h -header-y += processor-flags.h -header-y += ptrace-abi.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 += sigcontext32.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 += svm.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += ucontext.h -header-y += unistd.h -header-y += vm86.h -header-y += vmx.h -header-y += vsyscall.h diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild index 56aad54e7fb7..b15bf6bc0e94 100644 --- a/arch/xtensa/include/uapi/asm/Kbuild +++ b/arch/xtensa/include/uapi/asm/Kbuild @@ -1,25 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += byteorder.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 += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += swab.h -header-y += termbits.h -header-y += types.h -header-y += unistd.h diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm deleted file mode 100644 index d2ee86b4c091..000000000000 --- a/include/asm-generic/Kbuild.asm +++ /dev/null @@ -1 +0,0 @@ -include include/uapi/asm-generic/Kbuild.asm diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 245aa6e05e6a..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - - -header-y += asm-generic/ -header-y += linux/ -header-y += sound/ -header-y += mtd/ -header-y += rdma/ -header-y += video/ -header-y += drm/ -header-y += xen/ -header-y += scsi/ -header-y += misc/ diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild deleted file mode 100644 index b73de7bb7a62..000000000000 --- a/include/uapi/asm-generic/Kbuild +++ /dev/null @@ -1,36 +0,0 @@ -# UAPI Header export list -header-y += auxvec.h -header-y += bitsperlong.h -header-y += errno-base.h -header-y += errno.h -header-y += fcntl.h -header-y += int-l64.h -header-y += int-ll64.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += kvm_para.h -header-y += mman-common.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += shmparam.h -header-y += siginfo.h -header-y += signal-defs.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 += ucontext.h -header-y += unistd.h diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index fcd50b759217..8e6b335664f2 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -8,38 +8,38 @@ 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 +mandatory-y += auxvec.h +mandatory-y += bitsperlong.h +mandatory-y += byteorder.h +mandatory-y += errno.h +mandatory-y += fcntl.h +mandatory-y += ioctl.h +mandatory-y += ioctls.h +mandatory-y += ipcbuf.h +mandatory-y += mman.h +mandatory-y += msgbuf.h +mandatory-y += param.h +mandatory-y += poll.h +mandatory-y += posix_types.h +mandatory-y += ptrace.h +mandatory-y += resource.h +mandatory-y += sembuf.h +mandatory-y += setup.h +mandatory-y += shmbuf.h +mandatory-y += sigcontext.h +mandatory-y += siginfo.h +mandatory-y += signal.h +mandatory-y += socket.h +mandatory-y += sockios.h +mandatory-y += stat.h +mandatory-y += statfs.h +mandatory-y += swab.h +mandatory-y += termbits.h +mandatory-y += termios.h +mandatory-y += types.h +mandatory-y += unistd.h -header-y += $(foreach hdr,$(opt-header), \ +mandatory-y += $(foreach hdr,$(opt-header), \ $(if \ $(wildcard \ $(srctree)/arch/$(SRCARCH)/include/uapi/asm/$(hdr) \ diff --git a/include/uapi/drm/Kbuild b/include/uapi/drm/Kbuild deleted file mode 100644 index 9355dd8eff3b..000000000000 --- a/include/uapi/drm/Kbuild +++ /dev/null @@ -1,22 +0,0 @@ -# UAPI Header export list -header-y += drm.h -header-y += drm_fourcc.h -header-y += drm_mode.h -header-y += drm_sarea.h -header-y += amdgpu_drm.h -header-y += exynos_drm.h -header-y += i810_drm.h -header-y += i915_drm.h -header-y += mga_drm.h -header-y += nouveau_drm.h -header-y += qxl_drm.h -header-y += r128_drm.h -header-y += radeon_drm.h -header-y += savage_drm.h -header-y += sis_drm.h -header-y += tegra_drm.h -header-y += via_drm.h -header-y += vmwgfx_drm.h -header-y += msm_drm.h -header-y += vc4_drm.h -header-y += virtgpu_drm.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index f330ba4547cf..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,483 +0,0 @@ -# UAPI Header export list -header-y += android/ -header-y += byteorder/ -header-y += can/ -header-y += caif/ -header-y += dvb/ -header-y += hdlc/ -header-y += hsi/ -header-y += iio/ -header-y += isdn/ -header-y += mmc/ -header-y += nfsd/ -header-y += raid/ -header-y += spi/ -header-y += sunrpc/ -header-y += tc_act/ -header-y += tc_ematch/ -header-y += netfilter/ -header-y += netfilter_arp/ -header-y += netfilter_bridge/ -header-y += netfilter_ipv4/ -header-y += netfilter_ipv6/ -header-y += usb/ -header-y += wimax/ - -genhdr-y += version.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),) -header-y += a.out.h -endif - -header-y += acct.h -header-y += adb.h -header-y += adfs_fs.h -header-y += affs_hardblocks.h -header-y += agpgart.h -header-y += aio_abi.h -header-y += am437x-vpfe.h -header-y += apm_bios.h -header-y += arcfb.h -header-y += atalk.h -header-y += atmapi.h -header-y += atmarp.h -header-y += atmbr2684.h -header-y += atmclip.h -header-y += atmdev.h -header-y += atm_eni.h -header-y += atm.h -header-y += atm_he.h -header-y += atm_idt77105.h -header-y += atmioc.h -header-y += atmlec.h -header-y += atmmpc.h -header-y += atm_nicstar.h -header-y += atmppp.h -header-y += atmsap.h -header-y += atmsvc.h -header-y += atm_tcp.h -header-y += atm_zatm.h -header-y += audit.h -header-y += auto_fs4.h -header-y += auto_fs.h -header-y += auxvec.h -header-y += ax25.h -header-y += b1lli.h -header-y += baycom.h -header-y += bcm933xx_hcs.h -header-y += bfs_fs.h -header-y += binfmts.h -header-y += blkpg.h -header-y += blktrace_api.h -header-y += blkzoned.h -header-y += bpf_common.h -header-y += bpf_perf_event.h -header-y += bpf.h -header-y += bpqether.h -header-y += bsg.h -header-y += bt-bmc.h -header-y += btrfs.h -header-y += can.h -header-y += capability.h -header-y += capi.h -header-y += cciss_defs.h -header-y += cciss_ioctl.h -header-y += cdrom.h -header-y += cec.h -header-y += cec-funcs.h -header-y += cgroupstats.h -header-y += chio.h -header-y += cm4000_cs.h -header-y += cn_proc.h -header-y += coda.h -header-y += coda_psdev.h -header-y += coff.h -header-y += connector.h -header-y += const.h -header-y += cramfs_fs.h -header-y += cuda.h -header-y += cyclades.h -header-y += cycx_cfm.h -header-y += dcbnl.h -header-y += dccp.h -header-y += devlink.h -header-y += dlmconstants.h -header-y += dlm_device.h -header-y += dlm.h -header-y += dlm_netlink.h -header-y += dlm_plock.h -header-y += dm-ioctl.h -header-y += dm-log-userspace.h -header-y += dn.h -header-y += dqblk_xfs.h -header-y += edd.h -header-y += efs_fs_sb.h -header-y += elfcore.h -header-y += elf-em.h -header-y += elf-fdpic.h -header-y += elf.h -header-y += errno.h -header-y += errqueue.h -header-y += ethtool.h -header-y += eventpoll.h -header-y += fadvise.h -header-y += falloc.h -header-y += fanotify.h -header-y += fb.h -header-y += fcntl.h -header-y += fd.h -header-y += fdreg.h -header-y += fib_rules.h -header-y += fiemap.h -header-y += filter.h -header-y += firewire-cdev.h -header-y += firewire-constants.h -header-y += flat.h -header-y += fou.h -header-y += fs.h -header-y += fsl_hypervisor.h -header-y += fuse.h -header-y += futex.h -header-y += gameport.h -header-y += genetlink.h -header-y += gen_stats.h -header-y += gfs2_ondisk.h -header-y += gigaset_dev.h -header-y += gpio.h -header-y += gsmmux.h -header-y += gtp.h -header-y += hdlcdrv.h -header-y += hdlc.h -header-y += hdreg.h -header-y += hiddev.h -header-y += hid.h -header-y += hidraw.h -header-y += hpet.h -header-y += hsr_netlink.h -header-y += hyperv.h -header-y += hysdn_if.h -header-y += i2c-dev.h -header-y += i2c.h -header-y += i2o-dev.h -header-y += i8k.h -header-y += icmp.h -header-y += icmpv6.h -header-y += if_addr.h -header-y += if_addrlabel.h -header-y += if_alg.h -header-y += if_arcnet.h -header-y += if_arp.h -header-y += if_bonding.h -header-y += if_bridge.h -header-y += if_cablemodem.h -header-y += if_eql.h -header-y += if_ether.h -header-y += if_fc.h -header-y += if_fddi.h -header-y += if_frad.h -header-y += if.h -header-y += if_hippi.h -header-y += if_infiniband.h -header-y += if_link.h -header-y += if_ltalk.h -header-y += if_macsec.h -header-y += if_packet.h -header-y += if_phonet.h -header-y += if_plip.h -header-y += if_ppp.h -header-y += if_pppol2tp.h -header-y += if_pppox.h -header-y += if_slip.h -header-y += if_team.h -header-y += if_tun.h -header-y += if_tunnel.h -header-y += if_vlan.h -header-y += if_x25.h -header-y += igmp.h -header-y += ila.h -header-y += in6.h -header-y += inet_diag.h -header-y += in.h -header-y += inotify.h -header-y += input.h -header-y += input-event-codes.h -header-y += in_route.h -header-y += ioctl.h -header-y += ip6_tunnel.h -header-y += ipc.h -header-y += ip.h -header-y += ipmi.h -header-y += ipmi_msgdefs.h -header-y += ipsec.h -header-y += ipv6.h -header-y += ipv6_route.h -header-y += ip_vs.h -header-y += ipx.h -header-y += irda.h -header-y += irqnr.h -header-y += isdn_divertif.h -header-y += isdn.h -header-y += isdnif.h -header-y += isdn_ppp.h -header-y += iso_fs.h -header-y += ivtvfb.h -header-y += ivtv.h -header-y += ixjuser.h -header-y += jffs2.h -header-y += joystick.h -header-y += kcmp.h -header-y += kdev_t.h -header-y += kd.h -header-y += kernelcapi.h -header-y += kernel.h -header-y += kernel-page-flags.h -header-y += kexec.h -header-y += keyboard.h -header-y += keyctl.h - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),) -header-y += kvm.h -endif - - -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h \ - $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h),) -header-y += kvm_para.h -endif - -header-y += hw_breakpoint.h -header-y += l2tp.h -header-y += libc-compat.h -header-y += lirc.h -header-y += limits.h -header-y += llc.h -header-y += loop.h -header-y += lp.h -header-y += lwtunnel.h -header-y += magic.h -header-y += major.h -header-y += map_to_7segment.h -header-y += matroxfb.h -header-y += mdio.h -header-y += media.h -header-y += media-bus-format.h -header-y += mei.h -header-y += membarrier.h -header-y += memfd.h -header-y += mempolicy.h -header-y += meye.h -header-y += mic_common.h -header-y += mic_ioctl.h -header-y += mii.h -header-y += minix_fs.h -header-y += mman.h -header-y += mmtimer.h -header-y += mpls.h -header-y += mpls_iptunnel.h -header-y += mqueue.h -header-y += mroute6.h -header-y += mroute.h -header-y += msdos_fs.h -header-y += msg.h -header-y += mtio.h -header-y += nbd.h -header-y += ncp_fs.h -header-y += ncp.h -header-y += ncp_mount.h -header-y += ncp_no.h -header-y += ndctl.h -header-y += neighbour.h -header-y += netconf.h -header-y += netdevice.h -header-y += net_dropmon.h -header-y += netfilter_arp.h -header-y += netfilter_bridge.h -header-y += netfilter_decnet.h -header-y += netfilter.h -header-y += netfilter_ipv4.h -header-y += netfilter_ipv6.h -header-y += net.h -header-y += netlink_diag.h -header-y += netlink.h -header-y += netrom.h -header-y += net_namespace.h -header-y += net_tstamp.h -header-y += nfc.h -header-y += nfs2.h -header-y += nfs3.h -header-y += nfs4.h -header-y += nfs4_mount.h -header-y += nfsacl.h -header-y += nfs_fs.h -header-y += nfs.h -header-y += nfs_idmap.h -header-y += nfs_mount.h -header-y += nl80211.h -header-y += n_r3964.h -header-y += nubus.h -header-y += nvme_ioctl.h -header-y += nvram.h -header-y += omap3isp.h -header-y += omapfb.h -header-y += oom.h -header-y += openvswitch.h -header-y += packet_diag.h -header-y += param.h -header-y += parport.h -header-y += patchkey.h -header-y += pci.h -header-y += pci_regs.h -header-y += perf_event.h -header-y += personality.h -header-y += pfkeyv2.h -header-y += pg.h -header-y += phantom.h -header-y += phonet.h -header-y += pktcdvd.h -header-y += pkt_cls.h -header-y += pkt_sched.h -header-y += pmu.h -header-y += poll.h -header-y += posix_acl.h -header-y += posix_acl_xattr.h -header-y += posix_types.h -header-y += ppdev.h -header-y += ppp-comp.h -header-y += ppp_defs.h -header-y += ppp-ioctl.h -header-y += pps.h -header-y += prctl.h -header-y += psci.h -header-y += ptp_clock.h -header-y += ptrace.h -header-y += qnx4_fs.h -header-y += qnxtypes.h -header-y += quota.h -header-y += radeonfb.h -header-y += random.h -header-y += raw.h -header-y += rds.h -header-y += reboot.h -header-y += reiserfs_fs.h -header-y += reiserfs_xattr.h -header-y += resource.h -header-y += rfkill.h -header-y += rio_cm_cdev.h -header-y += rio_mport_cdev.h -header-y += romfs_fs.h -header-y += rose.h -header-y += route.h -header-y += rtc.h -header-y += rtnetlink.h -header-y += scc.h -header-y += sched.h -header-y += scif_ioctl.h -header-y += screen_info.h -header-y += sctp.h -header-y += sdla.h -header-y += seccomp.h -header-y += securebits.h -header-y += selinux_netlink.h -header-y += sem.h -header-y += serial_core.h -header-y += serial.h -header-y += serial_reg.h -header-y += serio.h -header-y += shm.h -header-y += signalfd.h -header-y += signal.h -header-y += smiapp.h -header-y += snmp.h -header-y += sock_diag.h -header-y += socket.h -header-y += sockios.h -header-y += sonet.h -header-y += sonypi.h -header-y += soundcard.h -header-y += sound.h -header-y += stat.h -header-y += stddef.h -header-y += string.h -header-y += suspend_ioctls.h -header-y += swab.h -header-y += synclink.h -header-y += sync_file.h -header-y += sysctl.h -header-y += sysinfo.h -header-y += target_core_user.h -header-y += taskstats.h -header-y += tcp.h -header-y += tcp_metrics.h -header-y += telephony.h -header-y += termios.h -header-y += thermal.h -header-y += time.h -header-y += timerfd.h -header-y += times.h -header-y += timex.h -header-y += tiocl.h -header-y += tipc_config.h -header-y += tipc_netlink.h -header-y += tipc.h -header-y += toshiba.h -header-y += tty_flags.h -header-y += tty.h -header-y += types.h -header-y += udf_fs_i.h -header-y += udp.h -header-y += uhid.h -header-y += uinput.h -header-y += uio.h -header-y += uleds.h -header-y += ultrasound.h -header-y += un.h -header-y += unistd.h -header-y += unix_diag.h -header-y += usbdevice_fs.h -header-y += usbip.h -header-y += utime.h -header-y += utsname.h -header-y += uuid.h -header-y += uvcvideo.h -header-y += v4l2-common.h -header-y += v4l2-controls.h -header-y += v4l2-dv-timings.h -header-y += v4l2-mediabus.h -header-y += v4l2-subdev.h -header-y += veth.h -header-y += vfio.h -header-y += vhost.h -header-y += videodev2.h -header-y += virtio_9p.h -header-y += virtio_balloon.h -header-y += virtio_blk.h -header-y += virtio_config.h -header-y += virtio_console.h -header-y += virtio_gpu.h -header-y += virtio_ids.h -header-y += virtio_input.h -header-y += virtio_net.h -header-y += virtio_pci.h -header-y += virtio_ring.h -header-y += virtio_rng.h -header-y += virtio_scsi.h -header-y += virtio_types.h -header-y += virtio_vsock.h -header-y += virtio_crypto.h -header-y += vm_sockets.h -header-y += vt.h -header-y += vtpm_proxy.h -header-y += wait.h -header-y += wanrouter.h -header-y += watchdog.h -header-y += wimax.h -header-y += wireless.h -header-y += x25.h -header-y += xattr.h -header-y += xfrm.h -header-y += xilinx-v4l2-controls.h -header-y += zorro.h -header-y += zorro_ids.h -header-y += userfaultfd.h diff --git a/include/uapi/linux/android/Kbuild b/include/uapi/linux/android/Kbuild deleted file mode 100644 index ca011eec252a..000000000000 --- a/include/uapi/linux/android/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += binder.h diff --git a/include/uapi/linux/byteorder/Kbuild b/include/uapi/linux/byteorder/Kbuild deleted file mode 100644 index 619225b9ff2e..000000000000 --- a/include/uapi/linux/byteorder/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += big_endian.h -header-y += little_endian.h diff --git a/include/uapi/linux/caif/Kbuild b/include/uapi/linux/caif/Kbuild deleted file mode 100644 index 43396612d3a3..000000000000 --- a/include/uapi/linux/caif/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += caif_socket.h -header-y += if_caif.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild deleted file mode 100644 index 21c91bf25a29..000000000000 --- a/include/uapi/linux/can/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += bcm.h -header-y += error.h -header-y += gw.h -header-y += netlink.h -header-y += raw.h diff --git a/include/uapi/linux/dvb/Kbuild b/include/uapi/linux/dvb/Kbuild deleted file mode 100644 index d40942cfc627..000000000000 --- a/include/uapi/linux/dvb/Kbuild +++ /dev/null @@ -1,9 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += ca.h -header-y += dmx.h -header-y += frontend.h -header-y += net.h -header-y += osd.h -header-y += version.h -header-y += video.h diff --git a/include/uapi/linux/hdlc/Kbuild b/include/uapi/linux/hdlc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/hdlc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild deleted file mode 100644 index a16a00544258..000000000000 --- a/include/uapi/linux/hsi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hsi_char.h cs-protocol.h diff --git a/include/uapi/linux/iio/Kbuild b/include/uapi/linux/iio/Kbuild deleted file mode 100644 index 86f76d84c44f..000000000000 --- a/include/uapi/linux/iio/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += events.h -header-y += types.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild deleted file mode 100644 index 89e52850bf29..000000000000 --- a/include/uapi/linux/isdn/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += capicmd.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild deleted file mode 100644 index 8c1d2cb75e33..000000000000 --- a/include/uapi/linux/mmc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += ioctl.h diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild deleted file mode 100644 index 03f194aeadc5..000000000000 --- a/include/uapi/linux/netfilter/Kbuild +++ /dev/null @@ -1,89 +0,0 @@ -# UAPI Header export list -header-y += ipset/ -header-y += nf_conntrack_common.h -header-y += nf_conntrack_ftp.h -header-y += nf_conntrack_sctp.h -header-y += nf_conntrack_tcp.h -header-y += nf_conntrack_tuple_common.h -header-y += nf_log.h -header-y += nf_tables.h -header-y += nf_tables_compat.h -header-y += nf_nat.h -header-y += nfnetlink.h -header-y += nfnetlink_acct.h -header-y += nfnetlink_compat.h -header-y += nfnetlink_conntrack.h -header-y += nfnetlink_cthelper.h -header-y += nfnetlink_cttimeout.h -header-y += nfnetlink_log.h -header-y += nfnetlink_queue.h -header-y += x_tables.h -header-y += xt_AUDIT.h -header-y += xt_CHECKSUM.h -header-y += xt_CLASSIFY.h -header-y += xt_CONNMARK.h -header-y += xt_CONNSECMARK.h -header-y += xt_CT.h -header-y += xt_DSCP.h -header-y += xt_HMARK.h -header-y += xt_IDLETIMER.h -header-y += xt_LED.h -header-y += xt_LOG.h -header-y += xt_MARK.h -header-y += xt_NFLOG.h -header-y += xt_NFQUEUE.h -header-y += xt_RATEEST.h -header-y += xt_SECMARK.h -header-y += xt_SYNPROXY.h -header-y += xt_TCPMSS.h -header-y += xt_TCPOPTSTRIP.h -header-y += xt_TEE.h -header-y += xt_TPROXY.h -header-y += xt_addrtype.h -header-y += xt_bpf.h -header-y += xt_cgroup.h -header-y += xt_cluster.h -header-y += xt_comment.h -header-y += xt_connbytes.h -header-y += xt_connlabel.h -header-y += xt_connlimit.h -header-y += xt_connmark.h -header-y += xt_conntrack.h -header-y += xt_cpu.h -header-y += xt_dccp.h -header-y += xt_devgroup.h -header-y += xt_dscp.h -header-y += xt_ecn.h -header-y += xt_esp.h -header-y += xt_hashlimit.h -header-y += xt_helper.h -header-y += xt_ipcomp.h -header-y += xt_iprange.h -header-y += xt_ipvs.h -header-y += xt_l2tp.h -header-y += xt_length.h -header-y += xt_limit.h -header-y += xt_mac.h -header-y += xt_mark.h -header-y += xt_multiport.h -header-y += xt_nfacct.h -header-y += xt_osf.h -header-y += xt_owner.h -header-y += xt_physdev.h -header-y += xt_pkttype.h -header-y += xt_policy.h -header-y += xt_quota.h -header-y += xt_rateest.h -header-y += xt_realm.h -header-y += xt_recent.h -header-y += xt_rpfilter.h -header-y += xt_sctp.h -header-y += xt_set.h -header-y += xt_socket.h -header-y += xt_state.h -header-y += xt_statistic.h -header-y += xt_string.h -header-y += xt_tcpmss.h -header-y += xt_tcpudp.h -header-y += xt_time.h -header-y += xt_u32.h diff --git a/include/uapi/linux/netfilter/ipset/Kbuild b/include/uapi/linux/netfilter/ipset/Kbuild deleted file mode 100644 index d2680423d9ab..000000000000 --- a/include/uapi/linux/netfilter/ipset/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += ip_set.h -header-y += ip_set_bitmap.h -header-y += ip_set_hash.h -header-y += ip_set_list.h diff --git a/include/uapi/linux/netfilter_arp/Kbuild b/include/uapi/linux/netfilter_arp/Kbuild deleted file mode 100644 index 62d5637cc0ac..000000000000 --- a/include/uapi/linux/netfilter_arp/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += arp_tables.h -header-y += arpt_mangle.h diff --git a/include/uapi/linux/netfilter_bridge/Kbuild b/include/uapi/linux/netfilter_bridge/Kbuild deleted file mode 100644 index 0fbad8ef96de..000000000000 --- a/include/uapi/linux/netfilter_bridge/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ebt_802_3.h -header-y += ebt_among.h -header-y += ebt_arp.h -header-y += ebt_arpreply.h -header-y += ebt_ip.h -header-y += ebt_ip6.h -header-y += ebt_limit.h -header-y += ebt_log.h -header-y += ebt_mark_m.h -header-y += ebt_mark_t.h -header-y += ebt_nat.h -header-y += ebt_nflog.h -header-y += ebt_pkttype.h -header-y += ebt_redirect.h -header-y += ebt_stp.h -header-y += ebt_vlan.h -header-y += ebtables.h diff --git a/include/uapi/linux/netfilter_ipv4/Kbuild b/include/uapi/linux/netfilter_ipv4/Kbuild deleted file mode 100644 index ecb291df390e..000000000000 --- a/include/uapi/linux/netfilter_ipv4/Kbuild +++ /dev/null @@ -1,10 +0,0 @@ -# UAPI Header export list -header-y += ip_tables.h -header-y += ipt_CLUSTERIP.h -header-y += ipt_ECN.h -header-y += ipt_LOG.h -header-y += ipt_REJECT.h -header-y += ipt_TTL.h -header-y += ipt_ah.h -header-y += ipt_ecn.h -header-y += ipt_ttl.h diff --git a/include/uapi/linux/netfilter_ipv6/Kbuild b/include/uapi/linux/netfilter_ipv6/Kbuild deleted file mode 100644 index 75a668ca2353..000000000000 --- a/include/uapi/linux/netfilter_ipv6/Kbuild +++ /dev/null @@ -1,13 +0,0 @@ -# UAPI Header export list -header-y += ip6_tables.h -header-y += ip6t_HL.h -header-y += ip6t_LOG.h -header-y += ip6t_NPT.h -header-y += ip6t_REJECT.h -header-y += ip6t_ah.h -header-y += ip6t_frag.h -header-y += ip6t_hl.h -header-y += ip6t_ipv6header.h -header-y += ip6t_mh.h -header-y += ip6t_opts.h -header-y += ip6t_rt.h diff --git a/include/uapi/linux/nfsd/Kbuild b/include/uapi/linux/nfsd/Kbuild deleted file mode 100644 index c11bc404053c..000000000000 --- a/include/uapi/linux/nfsd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += cld.h -header-y += debug.h -header-y += export.h -header-y += nfsfh.h -header-y += stats.h diff --git a/include/uapi/linux/raid/Kbuild b/include/uapi/linux/raid/Kbuild deleted file mode 100644 index e2c3d25405d7..000000000000 --- a/include/uapi/linux/raid/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# UAPI Header export list -header-y += md_p.h -header-y += md_u.h diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild deleted file mode 100644 index 0cc747eff165..000000000000 --- a/include/uapi/linux/spi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += spidev.h diff --git a/include/uapi/linux/sunrpc/Kbuild b/include/uapi/linux/sunrpc/Kbuild deleted file mode 100644 index 8e02e47c20fb..000000000000 --- a/include/uapi/linux/sunrpc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += debug.h diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild deleted file mode 100644 index e3db7403296f..000000000000 --- a/include/uapi/linux/tc_act/Kbuild +++ /dev/null @@ -1,15 +0,0 @@ -# UAPI Header export list -header-y += tc_csum.h -header-y += tc_defact.h -header-y += tc_gact.h -header-y += tc_ipt.h -header-y += tc_mirred.h -header-y += tc_nat.h -header-y += tc_pedit.h -header-y += tc_skbedit.h -header-y += tc_vlan.h -header-y += tc_bpf.h -header-y += tc_connmark.h -header-y += tc_ife.h -header-y += tc_tunnel_key.h -header-y += tc_skbmod.h diff --git a/include/uapi/linux/tc_ematch/Kbuild b/include/uapi/linux/tc_ematch/Kbuild deleted file mode 100644 index 53fca3925535..000000000000 --- a/include/uapi/linux/tc_ematch/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += tc_em_cmp.h -header-y += tc_em_meta.h -header-y += tc_em_nbyte.h -header-y += tc_em_text.h diff --git a/include/uapi/linux/usb/Kbuild b/include/uapi/linux/usb/Kbuild deleted file mode 100644 index 4cc4d6e7e523..000000000000 --- a/include/uapi/linux/usb/Kbuild +++ /dev/null @@ -1,12 +0,0 @@ -# UAPI Header export list -header-y += audio.h -header-y += cdc.h -header-y += cdc-wdm.h -header-y += ch11.h -header-y += ch9.h -header-y += functionfs.h -header-y += g_printer.h -header-y += gadgetfs.h -header-y += midi.h -header-y += tmc.h -header-y += video.h diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild deleted file mode 100644 index 1c97be49971f..000000000000 --- a/include/uapi/linux/wimax/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += i2400m.h diff --git a/include/uapi/misc/Kbuild b/include/uapi/misc/Kbuild deleted file mode 100644 index e96cae7d58c9..000000000000 --- a/include/uapi/misc/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# misc Header export list -header-y += cxl.h diff --git a/include/uapi/mtd/Kbuild b/include/uapi/mtd/Kbuild deleted file mode 100644 index 5a691e10cd0e..000000000000 --- a/include/uapi/mtd/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += inftl-user.h -header-y += mtd-abi.h -header-y += mtd-user.h -header-y += nftl-user.h -header-y += ubi-user.h diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild deleted file mode 100644 index 82bdf5626859..000000000000 --- a/include/uapi/rdma/Kbuild +++ /dev/null @@ -1,18 +0,0 @@ -# UAPI Header export list -header-y += ib_user_cm.h -header-y += ib_user_mad.h -header-y += ib_user_sa.h -header-y += ib_user_verbs.h -header-y += rdma_netlink.h -header-y += rdma_user_cm.h -header-y += hfi/ -header-y += rdma_user_rxe.h -header-y += cxgb3-abi.h -header-y += cxgb4-abi.h -header-y += mlx4-abi.h -header-y += mlx5-abi.h -header-y += mthca-abi.h -header-y += nes-abi.h -header-y += ocrdma-abi.h -header-y += hns-abi.h -header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/hfi/Kbuild b/include/uapi/rdma/hfi/Kbuild deleted file mode 100644 index ef23c294fc71..000000000000 --- a/include/uapi/rdma/hfi/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# UAPI Header export list -header-y += hfi1_user.h diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild deleted file mode 100644 index d791e0ad509d..000000000000 --- a/include/uapi/scsi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -header-y += fc/ -header-y += scsi_bsg_fc.h -header-y += scsi_netlink.h -header-y += scsi_netlink_fc.h -header-y += cxlflash_ioctl.h diff --git a/include/uapi/scsi/fc/Kbuild b/include/uapi/scsi/fc/Kbuild deleted file mode 100644 index 5ead9fac265c..000000000000 --- a/include/uapi/scsi/fc/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += fc_els.h -header-y += fc_fs.h -header-y += fc_gs.h -header-y += fc_ns.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 9578d8bdbf31..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,16 +0,0 @@ -# UAPI Header export list -header-y += asequencer.h -header-y += asoc.h -header-y += asound.h -header-y += asound_fm.h -header-y += compress_offload.h -header-y += compress_params.h -header-y += emu10k1.h -header-y += firewire.h -header-y += hdsp.h -header-y += hdspm.h -header-y += sb16_csp.h -header-y += sfnt_info.h -header-y += tlv.h -header-y += usb_stream.h -header-y += snd_sst_tokens.h diff --git a/include/uapi/video/Kbuild b/include/uapi/video/Kbuild deleted file mode 100644 index ac7203bb32cc..000000000000 --- a/include/uapi/video/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -# UAPI Header export list -header-y += edid.h -header-y += sisfb.h -header-y += uvesafb.h diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild deleted file mode 100644 index 5c459628e8c7..000000000000 --- a/include/uapi/xen/Kbuild +++ /dev/null @@ -1,5 +0,0 @@ -# UAPI Header export list -header-y += evtchn.h -header-y += gntalloc.h -header-y += gntdev.h -header-y += privcmd.h diff --git a/include/video/Kbuild b/include/video/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 876b42cfede4..16ac3e71050e 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -1,17 +1,19 @@ # ========================================================================== # Installing headers # -# header-y - list files to be installed. They are preprocessed -# to remove __KERNEL__ section of the file -# genhdr-y - Same as header-y but in a generated/ directory +# All headers under include/uapi, include/generated/uapi, +# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# exported. +# They are preprocessed to remove __KERNEL__ section of the file. # # ========================================================================== # generated header directory gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj))) +# Kbuild file is optional kbuild-file := $(srctree)/$(obj)/Kbuild -include $(kbuild-file) +-include $(kbuild-file) # called may set destination dir (when installing to asm/) _dst := $(if $(dst),$(dst),$(obj)) @@ -25,9 +27,12 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) -header-y := $(sort $(header-y)) -subdirs := $(patsubst %/,%,$(filter %/, $(header-y))) -header-y := $(filter-out %/, $(header-y)) +subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) +subdirs += $(subdir-y) +header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) +header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) +genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) +genhdr-files := $(filter-out $(header-files), $(genhdr-files)) # files used to track state of install/check install-file := $(installdir)/.install @@ -35,25 +40,23 @@ check-file := $(installdir)/.check # generic-y list all files an architecture uses from asm-generic # Use this to build a list of headers which require a wrapper -wrapper-files := $(filter $(header-y), $(generic-y)) +generic-files := $(notdir $(wildcard $(srctree)/include/uapi/asm-generic/*.h)) +wrapper-files := $(filter $(generic-files), $(generic-y)) +wrapper-files := $(filter-out $(header-files), $(wrapper-files)) srcdir := $(srctree)/$(obj) gendir := $(objtree)/$(gen) # all headers files for this dir -header-y := $(filter-out $(generic-y), $(header-y)) -all-files := $(header-y) $(genhdr-y) $(wrapper-files) +all-files := $(header-files) $(genhdr-files) $(wrapper-files) output-files := $(addprefix $(installdir)/, $(all-files)) -# Check that all expected files exist -$(foreach hdr, $(header-y), \ - $(if $(wildcard $(srcdir)/$(hdr)),, \ - $(error Missing UAPI file $(srcdir)/$(hdr)) \ - )) -$(foreach hdr, $(genhdr-y), \ - $(if $(wildcard $(gendir)/$(hdr)),, \ - $(error Missing generated UAPI file $(gendir)/$(hdr)) \ - )) +ifneq ($(mandatory-y),) +missing := $(filter-out $(all-files),$(mandatory-y)) +ifneq ($(missing),) +$(error Some mandatory headers ($(missing)) are missing in $(obj)) +endif +endif # Work out what needs to be removed oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) @@ -67,8 +70,8 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ file$(if $(word 2, $(all-files)),s)) cmd_install = \ - $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-y); \ - $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-y); \ + $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(header-files); \ + $(CONFIG_SHELL) $< $(installdir) $(gendir) $(genhdr-files); \ for F in $(wrapper-files); do \ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ done; \ -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* Re: [PATCH v4 6/7] uapi: export all headers under uapi directories 2017-01-23 14:58 ` [PATCH v4 6/7] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-01-23 15:25 ` Christoph Hellwig 2017-01-23 16:03 ` Nicolas Dichtel 2017-01-23 18:47 ` kbuild test robot 2017-01-23 18:52 ` kbuild test robot 2 siblings, 1 reply; 554+ messages in thread From: Christoph Hellwig @ 2017-01-23 15:25 UTC (permalink / raw) To: Nicolas Dichtel Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe > .install > linux/genwqe/.install > linux/genwqe/..install.cmd ... If these aren't just a mistake in your list the patches need to be fixed not to install this build system internal file. And I'm pretty sure I already pointed this out last time. ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 6/7] uapi: export all headers under uapi directories 2017-01-23 15:25 ` Christoph Hellwig @ 2017-01-23 16:03 ` Nicolas Dichtel 0 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-23 16:03 UTC (permalink / raw) To: Christoph Hellwig Cc: arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, tklauser, mpe Le 23/01/2017 à 16:25, Christoph Hellwig a écrit : >> .install > >> linux/genwqe/.install >> linux/genwqe/..install.cmd > > ... > > If these aren't just a mistake in your list the patches need to be > fixed not to install this build system internal file. > > And I'm pretty sure I already pointed this out last time. > Yes, it was already pointed out. But, as I said, this is done for *every* exported directory. My patch just follows how it is done currently: $ find . -name '.install' | wc -l 105 $ find . -name '..install.cmd' | wc -l 105 $ find . -type d | wc -l 105 I'm not against removing these files, but this should be done in another patch, it's not related to this series. Fell free to send a patch. Regards, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 6/7] uapi: export all headers under uapi directories 2017-01-23 14:58 ` [PATCH v4 6/7] uapi: export all headers under uapi directories Nicolas Dichtel 2017-01-23 15:25 ` Christoph Hellwig @ 2017-01-23 18:47 ` kbuild test robot 2017-01-23 18:52 ` kbuild test robot 2 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-01-23 18:47 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 1927 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc5] [cannot apply to next-20170123] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170124-011935 config: m32r-m32104ut_defconfig (attached as .config) compiler: m32r-linux-gcc (GCC) 6.2.0 reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=m32r All errors (new ones prefixed by >>): ./usr/include/linux/seg6_hmac.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/bcache.h:8: include of <linux/types.h> is preferred over <asm/types.h> ./usr/include/linux/bcache.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/kvm.h:13: included file 'asm-m32r/kvm.h' is not exported ./usr/include/linux/cryptouser.h:39: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/qrtr.h:8: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/btrfs_tree.h:337: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/a.out.h:8: included file 'asm-m32r/a.out.h' is not exported ./usr/include/linux/media.h:29: included file 'linux/version.h' is not exported ./usr/include/linux/pr.h:14: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/seg6.h:21: found __[us]{8,16,32,64} type without #include <linux/types.h> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 10946 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 6/7] uapi: export all headers under uapi directories @ 2017-01-23 18:47 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-01-23 18:47 UTC (permalink / raw) Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 1927 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc5] [cannot apply to next-20170123] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170124-011935 config: m32r-m32104ut_defconfig (attached as .config) compiler: m32r-linux-gcc (GCC) 6.2.0 reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=m32r All errors (new ones prefixed by >>): ./usr/include/linux/seg6_hmac.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/bcache.h:8: include of <linux/types.h> is preferred over <asm/types.h> ./usr/include/linux/bcache.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/kvm.h:13: included file 'asm-m32r/kvm.h' is not exported ./usr/include/linux/cryptouser.h:39: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/qrtr.h:8: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/btrfs_tree.h:337: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/a.out.h:8: included file 'asm-m32r/a.out.h' is not exported ./usr/include/linux/media.h:29: included file 'linux/version.h' is not exported ./usr/include/linux/pr.h:14: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/seg6.h:21: found __[us]{8,16,32,64} type without #include <linux/types.h> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 10946 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 6/7] uapi: export all headers under uapi directories @ 2017-01-23 18:47 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-01-23 18:47 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe [-- Attachment #1: Type: text/plain, Size: 1927 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc5] [cannot apply to next-20170123] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170124-011935 config: m32r-m32104ut_defconfig (attached as .config) compiler: m32r-linux-gcc (GCC) 6.2.0 reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=m32r All errors (new ones prefixed by >>): ./usr/include/linux/seg6_hmac.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/bcache.h:8: include of <linux/types.h> is preferred over <asm/types.h> ./usr/include/linux/bcache.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/kvm.h:13: included file 'asm-m32r/kvm.h' is not exported ./usr/include/linux/cryptouser.h:39: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/qrtr.h:8: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/btrfs_tree.h:337: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/a.out.h:8: included file 'asm-m32r/a.out.h' is not exported ./usr/include/linux/media.h:29: included file 'linux/version.h' is not exported ./usr/include/linux/pr.h:14: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/seg6.h:21: found __[us]{8,16,32,64} type without #include <linux/types.h> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 10946 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 6/7] uapi: export all headers under uapi directories 2017-01-23 14:58 ` [PATCH v4 6/7] uapi: export all headers under uapi directories Nicolas Dichtel 2017-01-23 15:25 ` Christoph Hellwig @ 2017-01-23 18:52 ` kbuild test robot 2017-01-23 18:52 ` kbuild test robot 2 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-01-23 18:52 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 2045 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc5] [cannot apply to next-20170123] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170124-011935 config: m68k-sun3_defconfig (attached as .config) compiler: m68k-linux-gcc (GCC) 4.9.0 reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=m68k Note: the linux-review/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170124-011935 HEAD a81d8a6f2713daacf40854afcf728c3f24d9c024 builds fine. It only hurts bisectibility. All error/warnings (new ones prefixed by >>): >> ./usr/include/linux/bcache.h:8: include of <linux/types.h> is preferred over <asm/types.h> >> ./usr/include/linux/bcache.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/kvm.h:13: included file 'asm-m68k/kvm.h' is not exported >> ./usr/include/linux/qrtr.h:8: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/cryptouser.h:39: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/media.h:29: included file 'linux/version.h' is not exported >> ./usr/include/linux/pr.h:14: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/btrfs_tree.h:337: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/seg6.h:21: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/seg6_hmac.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 11683 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 6/7] uapi: export all headers under uapi directories @ 2017-01-23 18:52 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-01-23 18:52 UTC (permalink / raw) Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, Nicolas Dichtel [-- Attachment #1: Type: text/plain, Size: 2045 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc5] [cannot apply to next-20170123] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170124-011935 config: m68k-sun3_defconfig (attached as .config) compiler: m68k-linux-gcc (GCC) 4.9.0 reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=m68k Note: the linux-review/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170124-011935 HEAD a81d8a6f2713daacf40854afcf728c3f24d9c024 builds fine. It only hurts bisectibility. All error/warnings (new ones prefixed by >>): >> ./usr/include/linux/bcache.h:8: include of <linux/types.h> is preferred over <asm/types.h> >> ./usr/include/linux/bcache.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/kvm.h:13: included file 'asm-m68k/kvm.h' is not exported >> ./usr/include/linux/qrtr.h:8: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/cryptouser.h:39: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/media.h:29: included file 'linux/version.h' is not exported >> ./usr/include/linux/pr.h:14: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/btrfs_tree.h:337: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/seg6.h:21: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/seg6_hmac.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 11683 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH v4 6/7] uapi: export all headers under uapi directories @ 2017-01-23 18:52 ` kbuild test robot 0 siblings, 0 replies; 554+ messages in thread From: kbuild test robot @ 2017-01-23 18:52 UTC (permalink / raw) To: Nicolas Dichtel Cc: kbuild-all, arnd, mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe [-- Attachment #1: Type: text/plain, Size: 2045 bytes --] Hi Nicolas, [auto build test ERROR on linus/master] [also build test ERROR on v4.10-rc5] [cannot apply to next-20170123] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170124-011935 config: m68k-sun3_defconfig (attached as .config) compiler: m68k-linux-gcc (GCC) 4.9.0 reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=m68k Note: the linux-review/Nicolas-Dichtel/uapi-export-all-headers-under-uapi-directories/20170124-011935 HEAD a81d8a6f2713daacf40854afcf728c3f24d9c024 builds fine. It only hurts bisectibility. All error/warnings (new ones prefixed by >>): >> ./usr/include/linux/bcache.h:8: include of <linux/types.h> is preferred over <asm/types.h> >> ./usr/include/linux/bcache.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/kvm.h:13: included file 'asm-m68k/kvm.h' is not exported >> ./usr/include/linux/qrtr.h:8: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/cryptouser.h:39: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/media.h:29: included file 'linux/version.h' is not exported >> ./usr/include/linux/pr.h:14: found __[us]{8,16,32,64} type without #include <linux/types.h> >> ./usr/include/linux/btrfs_tree.h:337: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/seg6.h:21: found __[us]{8,16,32,64} type without #include <linux/types.h> ./usr/include/linux/seg6_hmac.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 11683 bytes --] ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v4 7/7] uapi: export all arch specifics directories 2017-01-23 14:58 ` [PATCH v4 0/7] uapi: export all headers under uapi directories Nicolas Dichtel ` (5 preceding siblings ...) 2017-01-23 14:58 ` [PATCH v4 6/7] uapi: export all headers under uapi directories Nicolas Dichtel @ 2017-01-23 14:58 ` Nicolas Dichtel 6 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-23 14:58 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-kernel, linux-arch, airlied, davem, linux, bp, slash.tmp, daniel.vetter, rmk+kernel, msalter, jengelh, hch, tklauser, mpe, Nicolas Dichtel This patch removes the need of subdir-y. Now all files/directories under arch/<arch>/include/uapi/ are exported. The only change for userland is the layout of the command 'make headers_install_all': directories asm-<arch> are replaced by arch-<arch>/. Those new directories contains all files/directories of the specified arch. Note that only cris and tile have more directories than only asm: - arch-v[10|32] for cris; - arch for tile. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Documentation/kbuild/makefiles.txt | 15 +-------------- Makefile | 4 ++-- arch/cris/include/uapi/asm/Kbuild | 3 --- arch/tile/include/uapi/asm/Kbuild | 2 -- scripts/Makefile.headersinst | 3 +-- 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 51c072049e45..87a3d7d86776 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -48,7 +48,6 @@ This document describes the Linux kernel Makefiles. --- 7.2 genhdr-y --- 7.3 generic-y --- 7.4 generated-y - --- 7.5 subdir-y === 8 Kbuild Variables === 9 Makefile language @@ -1264,7 +1263,7 @@ The pre-processing does: - drop all sections that are kernel internal (guarded by ifdef __KERNEL__) All headers under include/uapi/, include/generated/uapi/, -arch/<arch>/include/uapi/asm/ and arch/<arch>/include/generated/uapi/asm/ +arch/<arch>/include/uapi/ and arch/<arch>/include/generated/uapi/ are exported. A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and @@ -1331,18 +1330,6 @@ See subsequent chapter for the syntax of the Kbuild file. #arch/x86/include/asm/Kbuild generated-y += syscalls_32.h - --- 7.5 subdir-y - - subdir-y may be used to specify a subdirectory to be exported. - - Example: - #arch/cris/include/uapi/asm/Kbuild - subdir-y += ../arch-v10/arch/ - subdir-y += ../arch-v32/arch/ - - The convention is to list one subdir per line and - preferably in alphabetic order. - === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/Makefile b/Makefile index 098840012b9b..46df2b272713 100644 --- a/Makefile +++ b/Makefile @@ -1126,7 +1126,7 @@ firmware_install: export INSTALL_HDR_PATH = $(objtree)/usr # If we do an all arch process set dst to asm-$(hdr-arch) -hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) +hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(hdr-arch), dst=include) PHONY += archheaders archheaders: @@ -1147,7 +1147,7 @@ headers_install: __headers $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ $(error Headers not exportable for the $(SRCARCH) architecture)) $(Q)$(MAKE) $(hdr-inst)=include/uapi - $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) + $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) PHONY += headers_check_all headers_check_all: headers_install_all diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index d0c5471856e0..b15bf6bc0e94 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,5 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -subdir-y += ../arch-v10/arch/ -subdir-y += ../arch-v32/arch/ diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index e0a50111e07f..0c74c3c5ebfa 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild @@ -2,5 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += ucontext.h - -subdir-y += ../arch diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 16ac3e71050e..cafaca2d9a23 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -2,7 +2,7 @@ # Installing headers # # All headers under include/uapi, include/generated/uapi, -# arch/<arch>/include/uapi/asm and arch/<arch>/include/generated/uapi/asm are +# arch/<arch>/include/uapi and arch/<arch>/include/generated/uapi are # exported. # They are preprocessed to remove __KERNEL__ section of the file. # @@ -28,7 +28,6 @@ include scripts/Kbuild.include installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) subdirs := $(patsubst $(srctree)/$(obj)/%/.,%,$(wildcard $(srctree)/$(obj)/*/.)) -subdirs += $(subdir-y) header-files := $(notdir $(wildcard $(srctree)/$(obj)/*.h)) header-files += $(notdir $(wildcard $(srctree)/$(obj)/*.agh)) genhdr-files := $(notdir $(wildcard $(srctree)/$(gen)/*.h)) -- 2.8.1 ^ permalink raw reply related [flat|nested] 554+ messages in thread
* [PATCH v3 0/8] uapi: export all headers under uapi directories 2017-01-09 11:33 ` Arnd Bergmann ` (10 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch Here is the v3 of this series. The first 5 patches are just cleanup: some exported headers were still under a non-uapi directory or (x86 case) were wrongly exported. The patch 6 was spotted by code review: there is no in-tree user of this functionality. Patches 7 and 8 remove the need to list explicitly headers. Now all files under an uapi directory are exported. This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. If I must rebase it against the kbuild tree, just tell me ;-) v2 -> v3: - patch #1: remove arch/arm/include/asm/types.h - patch #2: remove arch/h8300/include/asm/bitsperlong.h - patch #3: remove arch/nios2/include/uapi/asm/setup.h - patch #4: don't export msr-index.h - patch #5: fix a typo: s/unput-files3-name/input-files3-name - patch #6: no change - patch #7: fix include/uapi/asm-generic/Kbuild.asm by introducing mandatory-y - add patch #8 v1 -> v2: - add patch #1 to #6 - patch #7: remove use of header-y Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v3 0/8] uapi: export all headers under uapi directories 2017-01-09 11:33 ` Arnd Bergmann ` (11 preceding siblings ...) (?) @ 2017-01-13 10:46 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-13 10:46 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, daniel.vetter, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, linux, hch, coreteam, msalter, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k Here is the v3 of this series. The first 5 patches are just cleanup: some exported headers were still under a non-uapi directory or (x86 case) were wrongly exported. The patch 6 was spotted by code review: there is no in-tree user of this functionality. Patches 7 and 8 remove the need to list explicitly headers. Now all files under an uapi directory are exported. This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. If I must rebase it against the kbuild tree, just tell me ;-) v2 -> v3: - patch #1: remove arch/arm/include/asm/types.h - patch #2: remove arch/h8300/include/asm/bitsperlong.h - patch #3: remove arch/nios2/include/uapi/asm/setup.h - patch #4: don't export msr-index.h - patch #5: fix a typo: s/unput-files3-name/input-files3-name - patch #6: no change - patch #7: fix include/uapi/asm-generic/Kbuild.asm by introducing mandatory-y - add patch #8 v1 -> v2: - add patch #1 to #6 - patch #7: remove use of header-y Comments are welcomed, Nicolas _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 0/7] uapi: export all headers under uapi directories 2017-01-04 9:03 ` Nicolas Dichtel (?) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: linux-mips, alsa-devel, linux-ia64, linux-doc, airlied, linux-fbdev, dri-devel, linux-mtd, sparclinux, linux-arch, linux-s390, linux-am33-list, linux-c6x-dev, linux-rdma, linux-hexagon, linux-sh, coreteam, fcoe-devel, xen-devel, linux-snps-arc, linux-media, uclinux-h8-devel, linux-xtensa, linux-kbuild, adi-buildroot-devel, linux-raid, linux-m68k, openrisc, linux-metag, linux-arm-kernel Here is the v2 of this series. The first 5 patches are just cleanup: some exported headers were still under a non-uapi directory. The patch 6 was spotted by code review: there is no in-tree user of this functionality. The last patch remove the use of header-y. Now all files under an uapi directory are exported. asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm only, but there is two exceptions: - cris which exports arch/cris/include/uapi/arch-v[10|32]; - tile which exports arch/tile/include/uapi/arch. Because I don't know if the output of 'make headers_install_all' can be changed, I introduce subdir-y in Kbuild file. The headers_install_all target copies all asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not prefixed (they are put asis in usr/include/). If it's acceptable to modify the output of 'make headers_install_all' to export asm headers in usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports everything under arch/<arch>/include/uapi/. Note also that exported files for asm are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/x86/include/uapi/asm/Kbuild; - arch/x86/include/asm/Kbuild. This complicates a lot the processing (arch/x86/include/asm/Kbuild is also used by scripts/Makefile.asm-generic). This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. I don't know if it should be made against antoher tree. Comments are welcomed, Nicolas _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH v2 0/7] uapi: export all headers under uapi directories 2017-01-04 9:03 ` Nicolas Dichtel ` (2 preceding siblings ...) (?) @ 2017-01-06 9:43 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-06 9:43 UTC (permalink / raw) To: arnd Cc: mmarek, linux-kbuild, linux-doc, linux-kernel, linux-alpha, linux-snps-arc, linux-arm-kernel, adi-buildroot-devel, linux-c6x-dev, linux-cris-kernel, uclinux-h8-devel, linux-hexagon, linux-ia64, linux-m68k, linux-metag, linux-mips, linux-am33-list, nios2-dev, openrisc, linux-parisc, linuxppc-dev, linux-s390, linux-sh, sparclinux, linux-xtensa, linux-arch Here is the v2 of this series. The first 5 patches are just cleanup: some exported headers were still under a non-uapi directory. The patch 6 was spotted by code review: there is no in-tree user of this functionality. The last patch remove the use of header-y. Now all files under an uapi directory are exported. asm is a bit special, most of architectures export asm/<arch>/include/uapi/asm only, but there is two exceptions: - cris which exports arch/cris/include/uapi/arch-v[10|32]; - tile which exports arch/tile/include/uapi/arch. Because I don't know if the output of 'make headers_install_all' can be changed, I introduce subdir-y in Kbuild file. The headers_install_all target copies all asm/<arch>/include/uapi/asm to usr/include/asm-<arch> but arch/cris/include/uapi/arch-v[10|32] and arch/tile/include/uapi/arch are not prefixed (they are put asis in usr/include/). If it's acceptable to modify the output of 'make headers_install_all' to export asm headers in usr/include/asm-<arch>/asm, then I could remove this new subdir-y and exports everything under arch/<arch>/include/uapi/. Note also that exported files for asm are a mix of files listed by: - include/uapi/asm-generic/Kbuild.asm; - arch/x86/include/uapi/asm/Kbuild; - arch/x86/include/asm/Kbuild. This complicates a lot the processing (arch/x86/include/asm/Kbuild is also used by scripts/Makefile.asm-generic). This series has been tested with a 'make headers_install' on x86 and a 'make headers_install_all'. I've checked the result of both commands. This patch is built against linus tree. I don't know if it should be made against antoher tree. Comments are welcomed, Nicolas ^ permalink raw reply [flat|nested] 554+ messages in thread
* Re: [PATCH] uapi: use wildcards to list files 2017-01-03 21:37 ` Arnd Bergmann ` (2 preceding siblings ...) (?) @ 2017-01-04 9:03 ` Nicolas Dichtel -1 siblings, 0 replies; 554+ messages in thread From: Nicolas Dichtel @ 2017-01-04 9:03 UTC (permalink / raw) To: Arnd Bergmann Cc: linux-arch, David Howells, linux-nfs, alsa-devel, linux-rdma, netdev, linux-mmc, linux-kernel, dri-devel, linux-spi, linux-raid, airlied, netfilter-devel, linux-fbdev, xen-devel, fcoe-devel, linux-mtd, davem, linux-media Le 03/01/2017 à 22:37, Arnd Bergmann a écrit : > On Tuesday, January 3, 2017 3:35:44 PM CET Nicolas Dichtel wrote: >> Regularly, when a new header is created in include/uapi/, the developer >> forgets to add it in the corresponding Kbuild file. This error is usually >> detected after the release is out. >> >> In fact, all headers under include/uapi/ should be exported, so let's >> use wildcards. > > I think the idea makes a lot of sense: if a header is in uapi, we should > really export it. However, using a wildcard expression seems a bit > backwards here, I think we should make this implicit and not have the > Kbuild file at all. > > The "header-y" syntax was originally added back when the uapi headers > were mixed with the internal headers in the same directory. After > David Howells introduced the separate directory for uapi, it has > become a bit redundant. Ok, thank you for the explanation, I was wondering why those Kbuild files were needed. > > Can you try to modify scripts/Makefile.headersinst instead so we > can simply remove the Kbuild files entirely? I will try something. Regards, Nicolas _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH 0/3] UAPI export missing headers @ 2016-12-02 22:50 Stephen Hemminger 2016-12-02 22:50 ` [PATCH 3/3] uapi: export nf_log.h Stephen Hemminger 0 siblings, 1 reply; 554+ messages in thread From: Stephen Hemminger @ 2016-12-02 22:50 UTC (permalink / raw) To: davem; +Cc: netdev, pablo, jhs, Stephen Hemminger Files not being exported by make install headers Stephen Hemminger (3): tc: export tunnel key file uapi: export tc_skbmod.h uapi: export nf_log.h include/uapi/linux/netfilter/Kbuild | 1 + include/uapi/linux/tc_act/Kbuild | 2 ++ 2 files changed, 3 insertions(+) -- 2.10.2 ^ permalink raw reply [flat|nested] 554+ messages in thread
* [PATCH 3/3] uapi: export nf_log.h 2016-12-02 22:50 [PATCH 0/3] UAPI export missing headers Stephen Hemminger @ 2016-12-02 22:50 ` Stephen Hemminger 0 siblings, 0 replies; 554+ messages in thread From: Stephen Hemminger @ 2016-12-02 22:50 UTC (permalink / raw) To: davem; +Cc: netdev, pablo, jhs, Stephen Hemminger File is in uapi directory but not being copied on make install_headers Fixes commit 4ec9c8fbbc22 ("netfilter: nft_log: complete NFTA_LOG_FLAGS attr support"). Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com> --- include/uapi/linux/netfilter/Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild index cd26d7a..03f194a 100644 --- a/include/uapi/linux/netfilter/Kbuild +++ b/include/uapi/linux/netfilter/Kbuild @@ -5,6 +5,7 @@ header-y += nf_conntrack_ftp.h header-y += nf_conntrack_sctp.h header-y += nf_conntrack_tcp.h header-y += nf_conntrack_tuple_common.h +header-y += nf_log.h header-y += nf_tables.h header-y += nf_tables_compat.h header-y += nf_nat.h -- 2.10.2 ^ permalink raw reply related [flat|nested] 554+ messages in thread
end of thread, other threads:[~2017-05-16 4:59 UTC | newest]
Thread overview: 554+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-02 22:53 [PATCH v2 0/3] uapi: add kbuild for some files Stephen Hemminger
2016-12-02 22:53 ` [PATCH 1/3] uapi: export tc tunnel key file Stephen Hemminger
2016-12-04 0:21 ` David Miller
2016-12-02 22:53 ` [PATCH 2/3] uapi: export tc_skbmod.h Stephen Hemminger
2016-12-04 0:22 ` David Miller
2016-12-02 22:54 ` [PATCH 3/3] uapi: export nf_log.h Stephen Hemminger
2016-12-04 0:23 ` David Miller
2017-01-03 14:35 ` [PATCH] uapi: use wildcards to list files Nicolas Dichtel
2017-01-03 14:35 ` Nicolas Dichtel
2017-01-03 14:35 ` Nicolas Dichtel
2017-01-03 14:35 ` Nicolas Dichtel
2017-01-03 15:56 ` David Miller
2017-01-03 15:56 ` David Miller
2017-01-03 15:56 ` David Miller
2017-01-03 21:37 ` Arnd Bergmann
2017-01-03 21:37 ` Arnd Bergmann
2017-01-03 21:37 ` Arnd Bergmann
2017-01-03 21:37 ` Arnd Bergmann
2017-01-04 9:03 ` Nicolas Dichtel
2017-01-04 9:03 ` Nicolas Dichtel
2017-01-06 9:43 ` [PATCH v2 0/7] uapi: export all headers under uapi directories Nicolas Dichtel
2017-01-06 9:43 ` [OpenRISC] " Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` [PATCH v2 1/7] arm: put types.h in uapi Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` [OpenRISC] " Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` [OpenRISC] " Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 12:00 ` Russell King - ARM Linux
2017-01-09 12:00 ` [OpenRISC] " Russell King - ARM Linux
2017-01-09 12:00 ` Russell King - ARM Linux
2017-01-09 12:00 ` Russell King - ARM Linux
2017-01-09 12:00 ` Russell King - ARM Linux
2017-01-09 12:00 ` Russell King - ARM Linux
2017-01-09 12:00 ` Russell King - ARM Linux
2017-01-09 12:00 ` Russell King - ARM Linux
2017-01-09 12:00 ` Russell King - ARM Linux
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` [PATCH v2 2/7] h8300: put bitsperlong.h " Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` [OpenRISC] " Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` [PATCH v2 3/7] nios2: put setup.h " Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` [OpenRISC] " Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` [OpenRISC] " Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` [PATCH v2 4/7] x86: put msr-index.h " Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` [OpenRISC] " Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 12:14 ` Borislav Petkov
2017-01-06 12:14 ` Borislav Petkov
2017-01-06 12:14 ` Borislav Petkov
2017-01-06 12:14 ` [OpenRISC] " Borislav Petkov
2017-01-06 12:14 ` Borislav Petkov
2017-01-06 12:14 ` Borislav Petkov
2017-01-06 12:14 ` Borislav Petkov
2017-01-06 12:14 ` Borislav Petkov
2017-01-06 12:14 ` Borislav Petkov
2017-01-06 12:14 ` Borislav Petkov
2017-01-06 20:50 ` Andy Shevchenko
2017-01-06 20:50 ` Andy Shevchenko
2017-01-06 20:50 ` [OpenRISC] " Andy Shevchenko
2017-01-06 20:50 ` Andy Shevchenko
2017-01-06 20:50 ` Andy Shevchenko
2017-01-06 20:50 ` Andy Shevchenko
2017-01-06 20:50 ` Andy Shevchenko
2017-01-06 20:50 ` Andy Shevchenko
2017-01-06 20:50 ` Andy Shevchenko
2017-01-06 20:50 ` Andy Shevchenko
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` [PATCH v2 5/7] Makefile.headersinst: cleanup input files Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` [OpenRISC] " Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` [PATCH v2 6/7] Makefile.headersinst: remove destination-y option Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` [OpenRISC] " Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` [PATCH v2 7/7] uapi: export all headers under uapi directories Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` [OpenRISC] " Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-09 10:01 ` Daniel Vetter
2017-01-09 10:01 ` Daniel Vetter
2017-01-09 10:01 ` Daniel Vetter
2017-01-09 10:01 ` [OpenRISC] " Daniel Vetter
2017-01-09 10:01 ` Daniel Vetter
2017-01-09 10:01 ` Daniel Vetter
2017-01-09 10:01 ` Daniel Vetter
2017-01-09 10:01 ` Daniel Vetter
2017-01-09 10:01 ` Daniel Vetter
2017-01-09 10:01 ` Daniel Vetter
2017-01-09 12:01 ` Russell King - ARM Linux
[not found] ` <1483695839-18660-8-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2017-01-09 12:01 ` Russell King - ARM Linux
2017-01-09 12:01 ` [OpenRISC] " Russell King - ARM Linux
2017-01-09 12:01 ` Russell King - ARM Linux
2017-01-09 12:01 ` Russell King - ARM Linux
2017-01-09 12:01 ` Russell King - ARM Linux
2017-01-09 12:01 ` Russell King - ARM Linux
2017-01-09 12:01 ` Russell King - ARM Linux
2017-01-09 12:01 ` Russell King - ARM Linux
2017-01-09 12:01 ` Russell King - ARM Linux
2017-01-09 12:56 ` Christoph Hellwig
2017-01-09 12:56 ` [OpenRISC] " Christoph Hellwig
2017-01-09 12:56 ` Christoph Hellwig
2017-01-09 12:56 ` Christoph Hellwig
2017-01-09 12:56 ` Christoph Hellwig
2017-01-09 12:56 ` Christoph Hellwig
2017-01-09 12:56 ` Christoph Hellwig
2017-01-12 15:52 ` Nicolas Dichtel
2017-01-12 15:52 ` [OpenRISC] " Nicolas Dichtel
2017-01-12 15:52 ` Nicolas Dichtel
2017-01-12 15:52 ` Nicolas Dichtel
2017-01-12 15:52 ` Nicolas Dichtel
2017-01-12 15:52 ` Nicolas Dichtel
2017-01-12 15:52 ` Nicolas Dichtel
2017-01-12 15:52 ` Nicolas Dichtel
2017-01-12 16:28 ` Jan Engelhardt
2017-01-12 16:28 ` Jan Engelhardt
2017-01-12 16:28 ` [OpenRISC] " Jan Engelhardt
2017-01-12 16:28 ` Jan Engelhardt
2017-01-12 16:28 ` Jan Engelhardt
2017-01-12 16:28 ` Jan Engelhardt
2017-01-12 16:28 ` Jan Engelhardt
2017-01-12 16:28 ` Jan Engelhardt
2017-01-12 16:28 ` Jan Engelhardt
2017-01-12 16:32 ` Nicolas Dichtel
2017-01-12 16:32 ` Nicolas Dichtel
2017-01-12 16:32 ` Nicolas Dichtel
2017-01-12 16:32 ` [OpenRISC] " Nicolas Dichtel
2017-01-12 16:32 ` Nicolas Dichtel
2017-01-12 16:32 ` Nicolas Dichtel
2017-01-12 16:32 ` Nicolas Dichtel
2017-01-12 16:32 ` Nicolas Dichtel
2017-01-12 16:32 ` Nicolas Dichtel
2017-01-12 16:32 ` Nicolas Dichtel
2017-01-13 1:04 ` Jeff Epler
2017-01-13 1:04 ` Jeff Epler
2017-01-13 1:04 ` [OpenRISC] " Jeff Epler
2017-01-13 1:04 ` Jeff Epler
2017-01-13 1:04 ` Jeff Epler
2017-01-13 1:04 ` Jeff Epler
2017-01-13 1:04 ` Jeff Epler
2017-01-13 1:04 ` Jeff Epler
2017-01-13 1:04 ` Jeff Epler
2017-01-12 16:28 ` Jan Engelhardt
2017-01-12 15:52 ` Nicolas Dichtel
2017-01-12 15:52 ` Nicolas Dichtel
2017-01-09 12:56 ` Christoph Hellwig
2017-01-09 12:56 ` Christoph Hellwig
2017-01-11 18:14 ` [Linux-c6x-dev] " Mark Salter
2017-01-11 18:14 ` [OpenRISC] " Mark Salter
2017-01-11 18:14 ` Mark Salter
2017-01-11 18:14 ` Mark Salter
2017-01-11 18:14 ` Mark Salter
2017-01-11 18:14 ` Mark Salter
2017-01-11 18:14 ` Mark Salter
2017-01-11 18:14 ` Mark Salter
2017-01-09 11:33 ` [PATCH v2 0/7] " Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` [OpenRISC] " Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 11:33 ` Arnd Bergmann
2017-01-11 12:42 ` Jesper Nilsson
2017-01-11 12:42 ` Jesper Nilsson
2017-01-11 12:42 ` [OpenRISC] " Jesper Nilsson
2017-01-11 12:42 ` Jesper Nilsson
2017-01-11 12:42 ` Jesper Nilsson
2017-01-11 12:42 ` Jesper Nilsson
2017-01-11 12:42 ` Jesper Nilsson
2017-01-11 12:42 ` Jesper Nilsson
2017-01-11 12:42 ` Jesper Nilsson
2017-01-11 12:42 ` Jesper Nilsson
2017-01-13 10:46 ` [PATCH v3 0/8] " Nicolas Dichtel
2017-01-13 10:46 ` [OpenRISC] " Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` [PATCH v3 1/8] arm: put types.h in uapi Nicolas Dichtel
2017-01-13 10:46 ` [OpenRISC] " Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 17:06 ` Russell King - ARM Linux
2017-01-13 17:06 ` Russell King - ARM Linux
2017-01-13 17:06 ` Russell King - ARM Linux
2017-01-13 17:06 ` [OpenRISC] " Russell King - ARM Linux
2017-01-13 17:06 ` Russell King - ARM Linux
2017-01-13 17:06 ` Russell King - ARM Linux
2017-01-13 17:06 ` Russell King - ARM Linux
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` [PATCH v3 2/8] h8300: put bitsperlong.h " Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` [OpenRISC] " Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` [PATCH v3 3/8] nios2: put setup.h " Nicolas Dichtel
2017-01-13 10:46 ` [OpenRISC] " Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:55 ` Tobias Klauser
2017-01-13 10:55 ` Tobias Klauser
2017-01-13 10:55 ` [OpenRISC] " Tobias Klauser
2017-01-13 10:55 ` Tobias Klauser
2017-01-13 10:55 ` Tobias Klauser
2017-01-13 10:55 ` Tobias Klauser
2017-01-13 10:55 ` Tobias Klauser
2017-01-13 10:55 ` Tobias Klauser
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` [PATCH v3 4/8] x86: stop exporting msr-index.h to userland Nicolas Dichtel
2017-01-13 10:46 ` [OpenRISC] " Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` [PATCH v3 5/8] Makefile.headersinst: cleanup input files Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` [OpenRISC] " Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` [PATCH v3 6/8] Makefile.headersinst: remove destination-y option Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` [OpenRISC] " Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` [PATCH v3 7/8] uapi: export all headers under uapi directories Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` [OpenRISC] " Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-23 9:00 ` Michael Ellerman
2017-01-13 10:46 ` [PATCH v3 8/8] uapi: export all arch specifics directories Nicolas Dichtel
2017-01-13 10:46 ` [OpenRISC] " Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-13 15:36 ` (no subject) David Howells
2017-01-13 15:36 ` (unknown) David Howells
2017-01-13 15:36 ` [OpenRISC] (no subject) David Howells
2017-01-13 15:36 ` No subject David Howells
2017-01-13 15:36 ` (no subject) David Howells
2017-01-13 15:36 ` David Howells
2017-01-13 15:36 ` (unknown) David Howells
2017-01-13 16:01 ` [PATCH v3 1/8] arm: put types.h in uapi Nicolas Dichtel
2017-01-13 16:01 ` Nicolas Dichtel
2017-01-13 16:01 ` [OpenRISC] " Nicolas Dichtel
2017-01-13 16:01 ` Nicolas Dichtel
2017-01-13 16:01 ` Nicolas Dichtel
2017-01-13 16:01 ` Nicolas Dichtel
2017-01-13 16:01 ` Nicolas Dichtel
2017-01-13 16:01 ` Nicolas Dichtel
2017-01-13 16:19 ` Russell King - ARM Linux
2017-01-13 16:19 ` [OpenRISC] " Russell King - ARM Linux
2017-01-13 16:19 ` Russell King - ARM Linux
2017-01-13 16:19 ` Russell King - ARM Linux
2017-01-13 16:19 ` Russell King - ARM Linux
2017-01-13 16:19 ` Russell King - ARM Linux
2017-01-13 16:35 ` David Howells
2017-01-13 15:43 ` (no subject) David Howells
2017-01-13 15:43 ` [OpenRISC] " David Howells
2017-01-13 15:43 ` No subject David Howells
2017-01-13 15:43 ` David Howells
2017-01-13 15:43 ` (no subject) David Howells
2017-01-13 15:43 ` David Howells
2017-01-13 16:08 ` [PATCH v3 4/8] x86: stop exporting msr-index.h to userland Nicolas Dichtel
2017-01-13 16:08 ` [OpenRISC] " Nicolas Dichtel
2017-01-13 16:08 ` Nicolas Dichtel
2017-01-13 16:08 ` Nicolas Dichtel
2017-01-13 16:08 ` Nicolas Dichtel
2017-01-13 16:08 ` Nicolas Dichtel
2017-01-13 16:08 ` Nicolas Dichtel
2017-01-13 16:38 ` Borislav Petkov
2017-01-13 16:38 ` Borislav Petkov
2017-01-13 16:38 ` [OpenRISC] " Borislav Petkov
2017-01-13 16:38 ` Borislav Petkov
2017-01-13 16:38 ` Borislav Petkov
2017-01-13 16:38 ` Borislav Petkov
2017-01-13 16:38 ` Borislav Petkov
2017-01-13 16:08 ` Nicolas Dichtel
2017-01-13 15:43 ` (no subject) David Howells
2017-01-23 14:58 ` [PATCH v4 0/7] uapi: export all headers under uapi directories Nicolas Dichtel
2017-01-23 14:58 ` [PATCH v4 1/7] h8300: put bitsperlong.h in uapi Nicolas Dichtel
2017-01-23 14:58 ` [PATCH v4 2/7] nios2: put setup.h " Nicolas Dichtel
2017-01-23 14:58 ` [PATCH v4 3/7] x86: put msr-index.h " Nicolas Dichtel
2017-01-23 16:52 ` Borislav Petkov
2017-01-23 17:06 ` Nicolas Dichtel
2017-01-23 17:17 ` Borislav Petkov
2017-01-23 17:21 ` Christoph Hellwig
2017-01-23 17:26 ` Borislav Petkov
2017-01-23 22:24 ` Jan Engelhardt
2017-01-23 22:51 ` Borislav Petkov
2017-01-26 16:02 ` Nicolas Dichtel
2017-01-30 14:51 ` Russell King - ARM Linux
2017-01-30 15:30 ` Borislav Petkov
2017-01-31 10:58 ` Nicolas Dichtel
2017-01-31 16:21 ` Ingo Molnar
2017-02-02 13:25 ` [PATCH v5 0/8] uapi: export all headers under uapi directories Nicolas Dichtel
2017-02-02 13:25 ` [PATCH v5 1/8] h8300: put bitsperlong.h in uapi Nicolas Dichtel
2017-02-02 13:25 ` [PATCH v5 2/8] nios2: put setup.h " Nicolas Dichtel
2017-02-02 13:25 ` [PATCH v5 3/8] x86: stop exporting msr-index.h to userland Nicolas Dichtel
2017-02-02 13:38 ` Ingo Molnar
2017-02-02 13:25 ` [PATCH v5 4/8] Makefile.headersinst: cleanup input files Nicolas Dichtel
2017-02-02 13:25 ` [PATCH v5 5/8] Makefile.headersinst: remove destination-y option Nicolas Dichtel
2017-02-03 21:45 ` Paul Bolle
2017-02-02 13:25 ` [PATCH v5 6/8] uapi: includes linux/types.h before exporting files Nicolas Dichtel
2017-02-02 15:15 ` kbuild test robot
2017-02-02 15:15 ` kbuild test robot
2017-02-02 15:15 ` kbuild test robot
2017-02-02 15:27 ` kbuild test robot
2017-02-02 15:27 ` kbuild test robot
2017-02-02 15:27 ` kbuild test robot
2017-02-02 13:25 ` [PATCH v5 7/8] uapi: export all headers under uapi directories Nicolas Dichtel
2017-02-02 14:47 ` kbuild test robot
2017-02-02 14:47 ` kbuild test robot
2017-02-02 14:47 ` kbuild test robot
2017-02-02 15:42 ` Nicolas Dichtel
2017-02-10 10:58 ` [PATCH v6 0/8] " Nicolas Dichtel
2017-02-10 10:58 ` [PATCH v6 1/8] h8300: put bitsperlong.h in uapi Nicolas Dichtel
2017-02-10 10:58 ` [PATCH v6 2/8] nios2: put setup.h " Nicolas Dichtel
2017-02-10 10:58 ` [PATCH v6 3/8] x86: stop exporting msr-index.h to userland Nicolas Dichtel
2017-02-10 11:15 ` Thomas Gleixner
2017-02-10 10:58 ` [PATCH v6 4/8] Makefile.headersinst: cleanup input files Nicolas Dichtel
2017-02-10 10:58 ` [PATCH v6 5/8] Makefile.headersinst: remove destination-y option Nicolas Dichtel
2017-02-10 10:58 ` [PATCH v6 6/8] uapi: includes linux/types.h before exporting files Nicolas Dichtel
2017-02-10 10:58 ` [PATCH v6 7/8] uapi: export all headers under uapi directories Nicolas Dichtel
2017-02-13 7:49 ` Christoph Hellwig
2017-02-20 9:32 ` Nicolas Dichtel
2017-02-20 10:14 ` Arnd Bergmann
2017-02-20 12:58 ` Nicolas Dichtel
2017-02-24 16:49 ` [PATCH v7 0/8] " Nicolas Dichtel
2017-02-24 16:49 ` [PATCH v7 1/8] h8300: put bitsperlong.h in uapi Nicolas Dichtel
2017-02-24 16:49 ` [PATCH v7 2/8] nios2: put setup.h " Nicolas Dichtel
2017-02-24 16:49 ` [PATCH v7 3/8] x86: stop exporting msr-index.h to userland Nicolas Dichtel
2017-02-24 16:49 ` [PATCH v7 4/8] Makefile.headersinst: cleanup input files Nicolas Dichtel
2017-02-24 16:49 ` [PATCH v7 5/8] Makefile.headersinst: remove destination-y option Nicolas Dichtel
2017-02-24 16:49 ` [PATCH v7 6/8] uapi: includes linux/types.h before exporting files Nicolas Dichtel
2017-02-24 16:49 ` [PATCH v7 7/8] uapi: export all headers under uapi directories Nicolas Dichtel
2017-02-27 16:01 ` Nicolas Dichtel
2017-02-28 2:48 ` Dmitry V. Levin
2017-02-28 15:47 ` Nicolas Dichtel
2017-02-28 20:47 ` [PATCH v8 00/11] " Nicolas Dichtel
2017-02-28 20:47 ` [PATCH v8 01/11] h8300: put bitsperlong.h in uapi Nicolas Dichtel
2017-02-28 20:47 ` [PATCH v8 02/11] nios2: put setup.h " Nicolas Dichtel
2017-02-28 20:47 ` [PATCH v8 03/11] x86: stop exporting msr-index.h to userland Nicolas Dichtel
2017-02-28 20:47 ` [PATCH v8 04/11] Makefile.headersinst: cleanup input files Nicolas Dichtel
2017-02-28 20:47 ` [PATCH v8 05/11] Makefile.headersinst: remove destination-y option Nicolas Dichtel
2017-02-28 20:47 ` [PATCH v8 06/11] uapi: includes linux/types.h before exporting files Nicolas Dichtel
2017-02-28 20:47 ` [PATCH v8 07/11] btrfs_tree.h: fix include from userland Nicolas Dichtel
2017-02-28 20:47 ` [PATCH v8 08/11] cryptouser.h: " Nicolas Dichtel
[not found] ` <1488314857-28327-9-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2017-03-01 4:52 ` Herbert Xu
2017-03-01 4:52 ` Herbert Xu
2017-03-02 16:56 ` [PATCH v9 00/11] uapi: export all headers under uapi directories Nicolas Dichtel
2017-03-02 16:56 ` [PATCH v9 01/11] h8300: put bitsperlong.h in uapi Nicolas Dichtel
2017-03-02 16:56 ` [PATCH v9 02/11] nios2: put setup.h " Nicolas Dichtel
2017-03-02 16:56 ` [PATCH v9 03/11] x86: stop exporting msr-index.h to userland Nicolas Dichtel
2017-03-02 16:56 ` [PATCH v9 04/11] Makefile.headersinst: cleanup input files Nicolas Dichtel
2017-03-02 16:56 ` [PATCH v9 05/11] Makefile.headersinst: remove destination-y option Nicolas Dichtel
2017-03-02 16:56 ` [PATCH v9 06/11] uapi: includes linux/types.h before exporting files Nicolas Dichtel
2017-03-02 16:56 ` [PATCH v9 07/11] btrfs_tree.h: fix include from userland Nicolas Dichtel
2017-03-02 16:56 ` [PATCH v9 08/11] cryptouser.h: " Nicolas Dichtel
2017-03-03 9:35 ` Herbert Xu
[not found] ` <1488473802-13354-1-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2017-03-02 16:56 ` [PATCH v9 09/11] smc_diag.h: " Nicolas Dichtel
2017-03-02 16:56 ` Nicolas Dichtel
2017-03-02 16:56 ` [PATCH v9 10/11] uapi: export all headers under uapi directories Nicolas Dichtel
2017-03-02 16:56 ` Nicolas Dichtel
2017-03-02 16:56 ` [PATCH v9 11/11] uapi: export all arch specifics directories Nicolas Dichtel
2017-03-03 17:07 ` [PATCH v9 00/11] uapi: export all headers under uapi directories Nicolas Dichtel
2017-03-10 16:34 ` Nicolas Dichtel
2017-03-11 5:43 ` Masahiro Yamada
2017-03-13 16:57 ` Nicolas Dichtel
2017-03-14 5:38 ` Masahiro Yamada
2017-03-14 8:25 ` Nicolas Dichtel
2017-03-14 12:54 ` [PATCH v10 " Nicolas Dichtel
2017-03-14 12:54 ` [PATCH v10 01/11] h8300: put bitsperlong.h in uapi Nicolas Dichtel
2017-03-27 5:31 ` Masahiro Yamada
2017-03-27 9:43 ` Nicolas Dichtel
2017-03-14 12:54 ` [PATCH v10 02/11] nios2: put setup.h " Nicolas Dichtel
2017-03-14 12:54 ` [PATCH v10 03/11] x86: stop exporting msr-index.h to userland Nicolas Dichtel
2017-03-14 12:54 ` [PATCH v10 04/11] Makefile.headersinst: cleanup input files Nicolas Dichtel
2017-03-14 12:54 ` [PATCH v10 05/11] Makefile.headersinst: remove destination-y option Nicolas Dichtel
2017-03-14 12:54 ` [PATCH v10 06/11] uapi: includes linux/types.h before exporting files Nicolas Dichtel
2017-03-14 12:54 ` [PATCH v10 07/11] btrfs_tree.h: fix include from userland Nicolas Dichtel
2017-03-27 5:53 ` Masahiro Yamada
2017-03-27 9:45 ` Nicolas Dichtel
2017-03-14 12:54 ` [PATCH v10 08/11] cryptouser.h: " Nicolas Dichtel
2017-03-14 12:54 ` [PATCH v10 09/11] smc_diag.h: " Nicolas Dichtel
2017-03-14 12:54 ` [PATCH v10 10/11] uapi: export all headers under uapi directories Nicolas Dichtel
2017-03-14 12:54 ` [PATCH v10 11/11] uapi: export all arch specifics directories Nicolas Dichtel
2017-03-27 5:27 ` Masahiro Yamada
2017-03-27 9:42 ` Nicolas Dichtel
2017-03-24 8:32 ` [PATCH v10 00/11] uapi: export all headers under uapi directories Nicolas Dichtel
2017-03-24 8:42 ` Masahiro Yamada
2017-03-24 9:03 ` Nicolas Dichtel
2017-03-27 5:26 ` Masahiro Yamada
2017-03-27 9:45 ` Nicolas Dichtel
2017-03-27 15:33 ` Masahiro Yamada
2017-03-27 12:20 ` [PATCH v11 00/12] " Nicolas Dichtel
[not found] ` <1490617217-30192-1-git-send-email-nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2017-03-27 12:20 ` [PATCH v11 01/12] h8300: put bitsperlong.h in uapi Nicolas Dichtel
2017-03-27 12:20 ` Nicolas Dichtel
2017-03-27 12:20 ` [PATCH v11 02/12] nios2: put setup.h " Nicolas Dichtel
2017-03-27 12:20 ` Nicolas Dichtel
2017-03-27 12:20 ` [PATCH v11 04/12] Makefile.headersinst: cleanup input files Nicolas Dichtel
2017-03-27 12:20 ` Nicolas Dichtel
2017-03-27 12:20 ` [PATCH v11 11/12] uapi: export all arch specifics directories Nicolas Dichtel
2017-03-27 12:20 ` Nicolas Dichtel
2017-05-16 1:02 ` Dan Williams
2017-05-16 1:15 ` Dan Williams
2017-05-16 4:59 ` Masahiro Yamada
2017-05-16 4:59 ` Masahiro Yamada
2017-03-27 12:20 ` [PATCH v11 03/12] x86: stop exporting msr-index.h to userland Nicolas Dichtel
2017-03-27 12:20 ` [PATCH v11 05/12] Makefile.headersinst: remove destination-y option Nicolas Dichtel
2017-03-27 12:20 ` [PATCH v11 06/12] uapi: includes linux/types.h before exporting files Nicolas Dichtel
2017-03-27 12:20 ` [PATCH v11 07/12] btrfs_tree.h: fix include from userland Nicolas Dichtel
2017-03-27 12:20 ` [PATCH v11 08/12] cryptouser.h: " Nicolas Dichtel
2017-04-11 2:40 ` Herbert Xu
2017-03-27 12:20 ` [PATCH v11 09/12] smc_diag.h: " Nicolas Dichtel
2017-03-27 12:20 ` [PATCH v11 10/12] uapi: export all headers under uapi directories Nicolas Dichtel
2017-05-07 23:17 ` Masahiro Yamada
2017-05-09 10:09 ` Nicolas Dichtel
2017-05-09 17:22 ` Masahiro Yamada
2017-03-27 12:20 ` [PATCH v11 12/12] arch/include: remove empty Kbuild files Nicolas Dichtel
2017-03-27 15:35 ` [PATCH v11 00/12] uapi: export all headers under uapi directories Masahiro Yamada
2017-02-28 20:47 ` [PATCH v8 09/11] smc_diag.h: fix include from userland Nicolas Dichtel
2017-02-28 20:47 ` [PATCH v8 10/11] uapi: export all headers under uapi directories Nicolas Dichtel
2017-02-28 20:47 ` [PATCH v8 11/11] uapi: export all arch specifics directories Nicolas Dichtel
2017-02-24 16:49 ` [PATCH v7 8/8] " Nicolas Dichtel
2017-02-10 10:58 ` [PATCH v6 " Nicolas Dichtel
2017-02-02 13:25 ` [PATCH v5 " Nicolas Dichtel
2017-02-02 14:36 ` kbuild test robot
2017-02-02 14:36 ` kbuild test robot
2017-02-02 14:36 ` kbuild test robot
2017-02-02 14:46 ` kbuild test robot
2017-02-02 14:46 ` kbuild test robot
2017-02-02 14:46 ` kbuild test robot
2017-01-23 17:49 ` [PATCH v4 3/7] x86: put msr-index.h in uapi kbuild test robot
2017-01-23 17:49 ` kbuild test robot
2017-01-23 17:49 ` kbuild test robot
2017-01-23 19:11 ` kbuild test robot
2017-01-23 19:11 ` kbuild test robot
2017-01-23 19:11 ` kbuild test robot
2017-01-26 19:04 ` Ingo Molnar
2017-01-26 19:29 ` Borislav Petkov
2017-01-23 14:58 ` [PATCH v4 4/7] Makefile.headersinst: cleanup input files Nicolas Dichtel
2017-01-23 14:58 ` [PATCH v4 5/7] Makefile.headersinst: remove destination-y option Nicolas Dichtel
2017-01-23 14:58 ` [PATCH v4 6/7] uapi: export all headers under uapi directories Nicolas Dichtel
2017-01-23 15:25 ` Christoph Hellwig
2017-01-23 16:03 ` Nicolas Dichtel
2017-01-23 18:47 ` kbuild test robot
2017-01-23 18:47 ` kbuild test robot
2017-01-23 18:47 ` kbuild test robot
2017-01-23 18:52 ` kbuild test robot
2017-01-23 18:52 ` kbuild test robot
2017-01-23 18:52 ` kbuild test robot
2017-01-23 14:58 ` [PATCH v4 7/7] uapi: export all arch specifics directories Nicolas Dichtel
2017-01-13 10:46 ` [PATCH v3 0/8] uapi: export all headers under uapi directories Nicolas Dichtel
2017-01-13 10:46 ` Nicolas Dichtel
2017-01-06 9:43 ` [PATCH v2 0/7] " Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel
2017-01-04 9:03 ` [PATCH] uapi: use wildcards to list files Nicolas Dichtel
-- strict thread matches above, loose matches on Subject: below --
2016-12-02 22:50 [PATCH 0/3] UAPI export missing headers Stephen Hemminger
2016-12-02 22:50 ` [PATCH 3/3] uapi: export nf_log.h Stephen Hemminger
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.