UAPI disintegration for include/linux/{,byteorder/}*.h
Hi Linus,
Could you pull this please? I would recommend pulling it fairly late in the merge window and though I regenerated it today, it may also be worth regenerating it again before you pull it if you delay a few days. Also I may get acks for the unexport patches.
The patches contained herein do the following:
(1) Remove kernel-only stuff in linux/ppp-comp.h from the UAPI. I checked this with Paul Mackerras before I created the patch and he suggested some extra bits to unexport.
(2) Remove linux/blk_types.h entirely from the UAPI as none of it is userspace applicable, and remove from the UAPI that part of linux/fs.h that was the reason for linux/blk_types.h being exported in the first place. I discussed this with Jens Axboe before creating the patch.
(3) The big patch of the series to disintegrate include/linux/*.h as a unit. This could be split up, though there would be collisions in moving stuff between the two Kbuild files when the parts are merged as that file is sorted alphabetically rather than being grouped by subsystem.
Of this set of headers, 17 files have changed in the UAPI exported region since the 4th and only 8 since the 9th so there isn't much change in this area - as one might expect.
It should be pretty obvious and straightforward if it does come to fixing
up: stuff in __KERNEL__ guards stays where it is and stuff outside moves to the same file in the include/uapi/linux/ directory.
If a new file appears then things get a bit more complicated as the "headers +=" line has to move to include/uapi/linux/Kbuild. Only one new file has appeared since the 9th and I judge this type of event relatively unlikely.
(4) A patch to disintegrate include/linux/byteorder/*.h as a unit.
Signed-off-by David Howells <[email protected]>
---
The following changes since commit 4d7127dace8cf4b05eb7c8c8531fc204fbb195f4:
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security (2012-10-13 11:29:00 +0900)
are available in the git repository at:
git://git.infradead.org/users/dhowells/linux-headers.git tags/disintegrate-main-20121013
for you to fetch changes up to 5921e6f8809b1616932ca4afd40fe449faa8fd88:
UAPI: (Scripted) Disintegrate include/linux/byteorder (2012-10-13 10:46:49 +0100)
----------------------------------------------------------------
UAPI Disintegration 2012-10-13
----------------------------------------------------------------
David Howells (4):
UAPI: Unexport part of linux/ppp-comp.h
UAPI: Unexport linux/blk_types.h
UAPI: (Scripted) Disintegrate include/linux
UAPI: (Scripted) Disintegrate include/linux/byteorder
include/linux/Kbuild | 380 -----
include/linux/a.out.h | 196 +--
include/linux/acct.h | 108 +-
include/linux/adb.h | 39 +-
include/linux/adfs_fs.h | 42 +-
include/linux/agpgart.h | 86 +-
include/linux/apm_bios.h | 125 +-
include/linux/atalk.h | 43 +-
include/linux/atm.h | 238 +--
include/linux/atm_tcp.h | 54 +-
include/linux/atmdev.h | 213 +--
include/linux/audit.h | 381 +----
include/linux/auto_fs.h | 68 +-
include/linux/auxvec.h | 33 +-
include/linux/binfmts.h | 19 +-
include/linux/blktrace_api.h | 142 +-
include/linux/bsg.h | 63 +-
include/linux/byteorder/Kbuild | 2 -
include/linux/byteorder/big_endian.h | 103 +-
include/linux/byteorder/little_endian.h | 103 +-
include/linux/capability.h | 346 +----
include/linux/cciss_ioctl.h | 86 +-
include/linux/cdrom.h | 902 +----------
include/linux/cm4000_cs.h | 60 +-
include/linux/cn_proc.h | 103 +-
include/linux/coda.h | 680 +--------
include/linux/coda_psdev.h | 26 +-
include/linux/connector.h | 56 +-
include/linux/cramfs_fs.h | 86 +-
include/linux/cuda.h | 25 +-
include/linux/cyclades.h | 426 +-----
include/linux/dccp.h | 236 +--
include/linux/dlm.h | 62 +-
include/linux/dlm_plock.h | 37 +-
include/linux/edd.h | 158 +-
include/linux/elf.h | 414 +----
include/linux/elfcore.h | 102 +-
include/linux/errno.h | 5 +-
include/linux/errqueue.h | 25 +-
include/linux/ethtool.h | 1076 +------------
include/linux/eventpoll.h | 53 +-
include/linux/falloc.h | 7 +-
include/linux/fanotify.h | 114 +-
include/linux/fb.h | 403 +----
include/linux/fcntl.h | 50 +-
include/linux/fd.h | 380 +----
include/linux/filter.h | 133 +-
include/linux/flat.h | 50 +-
include/linux/fs.h | 442 +-----
include/linux/fsl_hypervisor.h | 180 +--
include/linux/futex.h | 150 +-
include/linux/gameport.h | 26 +-
include/linux/genetlink.h | 82 +-
include/linux/hdlc.h | 13 +-
include/linux/hdlcdrv.h | 104 +-
include/linux/hid.h | 46 +-
include/linux/hiddev.h | 190 +--
include/linux/hidraw.h | 40 +-
include/linux/hpet.h | 23 +-
include/linux/i2c-dev.h | 49 +-
include/linux/i2c.h | 125 +-
include/linux/icmp.h | 80 +-
include/linux/icmpv6.h | 165 +-
include/linux/if_arp.h | 136 +-
include/linux/if_bridge.h | 89 +-
include/linux/if_eql.h | 36 +-
include/linux/if_ether.h | 115 +-
include/linux/if_fddi.h | 80 +-
include/linux/if_frad.h | 98 +-
include/linux/if_link.h | 427 +-----
include/linux/if_ltalk.h | 7 +-
include/linux/if_phonet.h | 7 +-
include/linux/if_pppol2tp.h | 89 +-
include/linux/if_pppox.h | 143 +-
include/linux/if_team.h | 97 +-
include/linux/if_tun.h | 78 +-
include/linux/if_tunnel.h | 94 +-
include/linux/if_vlan.h | 51 +-
include/linux/igmp.h | 113 +-
include/linux/in.h | 235 +--
include/linux/in6.h | 258 +---
include/linux/inet_diag.h | 134 +-
include/linux/inotify.h | 69 +-
include/linux/input.h | 1151 +-------------
include/linux/ip.h | 119 +-
include/linux/ipc.h | 80 +-
include/linux/ipmi.h | 422 +-----
include/linux/ipv6.h | 166 +-
include/linux/ipv6_route.h | 45 +-
include/linux/irqnr.h | 8 +-
include/linux/isdn.h | 130 +-
include/linux/isdn_divertif.h | 18 +-
include/linux/isdn_ppp.h | 55 +-
include/linux/isdnif.h | 43 +-
include/linux/joystick.h | 114 +-
include/linux/kd.h | 181 +--
include/linux/kdev_t.h | 14 +-
include/linux/kernel-page-flags.h | 34 +-
include/linux/kernel.h | 12 +-
include/linux/kernelcapi.h | 38 +-
include/linux/kexec.h | 52 +-
include/linux/keyboard.h | 441 +-----
include/linux/kvm_para.h | 26 +-
include/linux/l2tp.h | 172 +--
include/linux/llc.h | 74 +-
include/linux/loop.h | 91 +-
include/linux/lp.h | 97 +-
include/linux/mdio.h | 287 +---
include/linux/mempolicy.h | 63 +-
include/linux/mii.h | 154 +-
include/linux/mman.h | 12 +-
include/linux/mroute.h | 146 +-
include/linux/mroute6.h | 138 +-
include/linux/msdos_fs.h | 165 +-
include/linux/msg.h | 74 +-
include/linux/n_r3964.h | 56 +-
include/linux/nbd.h | 63 +-
include/linux/net.h | 39 +-
include/linux/netdevice.h | 32 +-
include/linux/netfilter.h | 72 +-
include/linux/netfilter_bridge.h | 27 +-
include/linux/netfilter_ipv4.h | 80 +-
include/linux/netfilter_ipv6.h | 75 +-
include/linux/netlink.h | 152 +-
include/linux/nfs.h | 124 +-
include/linux/nfs3.h | 92 +-
include/linux/nfs4.h | 166 +-
include/linux/nfs_fs.h | 54 +-
include/linux/nfs_idmap.h | 28 +-
include/linux/nfsacl.h | 23 +-
include/linux/nubus.h | 234 +--
include/linux/nvram.h | 14 +-
include/linux/omapfb.h | 198 +--
include/linux/oom.h | 10 +-
include/linux/parport.h | 89 +-
include/linux/patchkey.h | 24 +-
include/linux/pci.h | 25 +-
include/linux/perf_event.h | 600 +-------
include/linux/personality.h | 71 +-
include/linux/phonet.h | 162 +-
include/linux/pktcdvd.h | 99 +-
include/linux/pmu.h | 130 +-
include/linux/poll.h | 6 +-
include/linux/ppp-comp.h | 84 +-
include/linux/ppp_defs.h | 141 +-
include/linux/ptrace.h | 88 +-
include/linux/quota.h | 139 +-
include/linux/random.h | 43 +-
include/linux/reboot.h | 38 +-
include/linux/resource.h | 78 +-
include/linux/rfkill.h | 92 +-
include/linux/rtc.h | 96 +-
include/linux/rtnetlink.h | 611 +-------
include/linux/scc.h | 169 +--
include/linux/sched.h | 44 +-
include/linux/screen_info.h | 72 +-
include/linux/sdla.h | 93 +-
include/linux/seccomp.h | 45 +-
include/linux/securebits.h | 51 +-
include/linux/sem.h | 79 +-
include/linux/serial.h | 119 +-
include/linux/serial_core.h | 199 +--
include/linux/serio.h | 76 +-
include/linux/shm.h | 81 +-
include/linux/signal.h | 7 +-
include/linux/signalfd.h | 44 +-
include/linux/sock_diag.h | 24 +-
include/linux/socket.h | 20 +-
include/linux/sonet.h | 58 +-
include/linux/sonypi.h | 110 +-
include/linux/sound.h | 29 +-
include/linux/soundcard.h | 1261 +---------------
include/linux/stat.h | 46 +-
include/linux/stddef.h | 5 +-
include/linux/string.h | 7 +-
include/linux/swab.h | 280 +---
include/linux/synclink.h | 288 +---
include/linux/sysctl.h | 911 +----------
include/linux/tcp.h | 208 +--
include/linux/time.h | 72 +-
include/linux/timex.h | 113 +-
include/linux/toshiba.h | 17 +-
include/linux/tty.h | 37 +-
include/linux/types.h | 50 +-
include/linux/udp.h | 22 +-
include/linux/uinput.h | 109 +-
include/linux/uio.h | 24 +-
include/linux/usbdevice_fs.h | 151 +-
include/linux/utsname.h | 33 +-
include/linux/uuid.h | 37 +-
include/linux/vfio.h | 357 +----
include/linux/videodev2.h | 1940 +-----------------------
include/linux/virtio_config.h | 53 +-
include/linux/virtio_console.h | 45 +-
include/linux/virtio_ring.h | 163 +-
include/linux/vt.h | 88 +-
include/linux/wait.h | 20 +-
include/linux/wanrouter.h | 405 +----
include/linux/watchdog.h | 49 +-
include/linux/wireless.h | 1120 +-------------
include/linux/xattr.h | 54 +-
include/uapi/linux/Kbuild | 393 +++++
include/uapi/linux/a.out.h | 274 ++++
include/uapi/linux/acct.h | 122 ++
include/uapi/linux/adb.h | 44 +
include/uapi/linux/adfs_fs.h | 44 +
include/{ => uapi}/linux/affs_hardblocks.h | 0
include/uapi/linux/agpgart.h | 113 ++
include/{ => uapi}/linux/aio_abi.h | 0
include/uapi/linux/apm_bios.h | 135 ++
include/{ => uapi}/linux/arcfb.h | 0
include/uapi/linux/atalk.h | 44 +
include/uapi/linux/atm.h | 241 +++
include/{ => uapi}/linux/atm_eni.h | 0
include/{ => uapi}/linux/atm_he.h | 0
include/{ => uapi}/linux/atm_idt77105.h | 0
include/{ => uapi}/linux/atm_nicstar.h | 0
include/uapi/linux/atm_tcp.h | 61 +
include/{ => uapi}/linux/atm_zatm.h | 0
include/{ => uapi}/linux/atmapi.h | 0
include/{ => uapi}/linux/atmarp.h | 0
include/{ => uapi}/linux/atmbr2684.h | 0
include/{ => uapi}/linux/atmclip.h | 0
include/uapi/linux/atmdev.h | 215 +++
include/{ => uapi}/linux/atmioc.h | 0
include/{ => uapi}/linux/atmlec.h | 0
include/{ => uapi}/linux/atmmpc.h | 0
include/{ => uapi}/linux/atmppp.h | 0
include/{ => uapi}/linux/atmsap.h | 0
include/{ => uapi}/linux/atmsvc.h | 0
include/uapi/linux/audit.h | 404 +++++
include/uapi/linux/auto_fs.h | 83 +
include/{ => uapi}/linux/auto_fs4.h | 0
include/uapi/linux/auxvec.h | 35 +
include/{ => uapi}/linux/ax25.h | 0
include/{ => uapi}/linux/b1lli.h | 0
include/{ => uapi}/linux/baycom.h | 0
include/{ => uapi}/linux/bfs_fs.h | 0
include/uapi/linux/binfmts.h | 20 +
include/{ => uapi}/linux/blkpg.h | 0
include/uapi/linux/blktrace_api.h | 142 ++
include/{ => uapi}/linux/bpqether.h | 0
include/uapi/linux/bsg.h | 65 +
include/uapi/linux/byteorder/Kbuild | 2 +
include/uapi/linux/byteorder/big_endian.h | 105 ++
include/uapi/linux/byteorder/little_endian.h | 105 ++
include/{ => uapi}/linux/can.h | 0
include/uapi/linux/capability.h | 358 +++++
include/{ => uapi}/linux/capi.h | 0
include/{ => uapi}/linux/cciss_defs.h | 0
include/uapi/linux/cciss_ioctl.h | 88 ++
include/uapi/linux/cdrom.h | 912 +++++++++++
include/{ => uapi}/linux/cgroupstats.h | 0
include/{ => uapi}/linux/chio.h | 0
include/uapi/linux/cm4000_cs.h | 62 +
include/uapi/linux/cn_proc.h | 121 ++
include/uapi/linux/coda.h | 741 +++++++++
include/uapi/linux/coda_psdev.h | 27 +
include/{ => uapi}/linux/coff.h | 0
include/uapi/linux/connector.h | 77 +
include/{ => uapi}/linux/const.h | 0
include/uapi/linux/cramfs_fs.h | 88 ++
include/uapi/linux/cuda.h | 33 +
include/uapi/linux/cyclades.h | 493 ++++++
include/{ => uapi}/linux/cycx_cfm.h | 0
include/{ => uapi}/linux/dcbnl.h | 0
include/uapi/linux/dccp.h | 237 +++
include/uapi/linux/dlm.h | 75 +
include/{ => uapi}/linux/dlm_device.h | 0
include/{ => uapi}/linux/dlm_netlink.h | 0
include/uapi/linux/dlm_plock.h | 45 +
include/{ => uapi}/linux/dlmconstants.h | 0
include/{ => uapi}/linux/dm-ioctl.h | 0
include/{ => uapi}/linux/dm-log-userspace.h | 0
include/{ => uapi}/linux/dn.h | 0
include/{ => uapi}/linux/dqblk_xfs.h | 0
include/uapi/linux/edd.h | 191 +++
include/{ => uapi}/linux/efs_fs_sb.h | 0
include/{ => uapi}/linux/elf-em.h | 0
include/{ => uapi}/linux/elf-fdpic.h | 2 +-
include/uapi/linux/elf.h | 414 +++++
include/uapi/linux/elfcore.h | 100 ++
include/uapi/linux/errno.h | 1 +
include/uapi/linux/errqueue.h | 26 +
include/uapi/linux/ethtool.h | 1085 ++++++++++++++
include/uapi/linux/eventpoll.h | 66 +
include/{ => uapi}/linux/fadvise.h | 0
include/uapi/linux/falloc.h | 9 +
include/uapi/linux/fanotify.h | 116 ++
include/uapi/linux/fb.h | 402 +++++
include/uapi/linux/fcntl.h | 52 +
include/uapi/linux/fd.h | 382 +++++
include/{ => uapi}/linux/fdreg.h | 0
include/{ => uapi}/linux/fib_rules.h | 0
include/{ => uapi}/linux/fiemap.h | 0
include/uapi/linux/filter.h | 135 ++
include/{ => uapi}/linux/firewire-cdev.h | 0
include/{ => uapi}/linux/firewire-constants.h | 0
include/uapi/linux/flat.h | 58 +
include/uapi/linux/fs.h | 334 +++++
include/uapi/linux/fsl_hypervisor.h | 220 +++
include/{ => uapi}/linux/fuse.h | 0
include/uapi/linux/futex.h | 152 ++
include/uapi/linux/gameport.h | 28 +
include/{ => uapi}/linux/gen_stats.h | 0
include/uapi/linux/genetlink.h | 84 ++
include/{ => uapi}/linux/gfs2_ondisk.h | 0
include/{ => uapi}/linux/gigaset_dev.h | 0
include/uapi/linux/hdlc.h | 23 +
include/uapi/linux/hdlcdrv.h | 110 ++
include/{ => uapi}/linux/hdreg.h | 0
include/uapi/linux/hid.h | 66 +
include/uapi/linux/hiddev.h | 212 +++
include/uapi/linux/hidraw.h | 50 +
include/uapi/linux/hpet.h | 25 +
include/{ => uapi}/linux/hysdn_if.h | 0
include/uapi/linux/i2c-dev.h | 72 +
include/uapi/linux/i2c.h | 151 ++
include/{ => uapi}/linux/i2o-dev.h | 0
include/{ => uapi}/linux/i8k.h | 0
include/uapi/linux/icmp.h | 97 ++
include/uapi/linux/icmpv6.h | 164 ++
include/{ => uapi}/linux/if.h | 0
include/{ => uapi}/linux/if_addr.h | 0
include/{ => uapi}/linux/if_addrlabel.h | 0
include/{ => uapi}/linux/if_alg.h | 0
include/{ => uapi}/linux/if_arcnet.h | 0
include/uapi/linux/if_arp.h | 159 ++
include/{ => uapi}/linux/if_bonding.h | 0
include/uapi/linux/if_bridge.h | 101 ++
include/{ => uapi}/linux/if_cablemodem.h | 0
include/uapi/linux/if_eql.h | 54 +
include/uapi/linux/if_ether.h | 135 ++
include/{ => uapi}/linux/if_fc.h | 0
include/uapi/linux/if_fddi.h | 104 ++
include/uapi/linux/if_frad.h | 122 ++
include/{ => uapi}/linux/if_hippi.h | 0
include/{ => uapi}/linux/if_infiniband.h | 0
include/uapi/linux/if_link.h | 429 ++++++
include/uapi/linux/if_ltalk.h | 9 +
include/{ => uapi}/linux/if_packet.h | 0
include/uapi/linux/if_phonet.h | 16 +
include/{ => uapi}/linux/if_plip.h | 0
include/{ => uapi}/linux/if_ppp.h | 0
include/uapi/linux/if_pppol2tp.h | 104 ++
include/uapi/linux/if_pppox.h | 156 ++
include/{ => uapi}/linux/if_slip.h | 0
include/uapi/linux/if_team.h | 107 ++
include/uapi/linux/if_tun.h | 94 ++
include/uapi/linux/if_tunnel.h | 96 ++
include/uapi/linux/if_vlan.h | 63 +
include/{ => uapi}/linux/if_x25.h | 0
include/uapi/linux/igmp.h | 128 ++
include/uapi/linux/in.h | 253 ++++
include/uapi/linux/in6.h | 279 ++++
include/{ => uapi}/linux/in_route.h | 0
include/uapi/linux/inet_diag.h | 136 ++
include/uapi/linux/inotify.h | 74 +
include/uapi/linux/input.h | 1153 ++++++++++++++
include/{ => uapi}/linux/ioctl.h | 0
include/uapi/linux/ip.h | 136 ++
include/{ => uapi}/linux/ip6_tunnel.h | 0
include/{ => uapi}/linux/ip_vs.h | 0
include/uapi/linux/ipc.h | 81 +
include/uapi/linux/ipmi.h | 456 ++++++
include/{ => uapi}/linux/ipmi_msgdefs.h | 0
include/{ => uapi}/linux/ipsec.h | 0
include/uapi/linux/ipv6.h | 164 ++
include/uapi/linux/ipv6_route.h | 58 +
include/{ => uapi}/linux/ipx.h | 0
include/{ => uapi}/linux/irda.h | 0
include/uapi/linux/isdn.h | 143 ++
include/uapi/linux/isdn_divertif.h | 30 +
include/uapi/linux/isdn_ppp.h | 67 +
include/uapi/linux/isdnif.h | 56 +
include/{ => uapi}/linux/iso_fs.h | 0
include/{ => uapi}/linux/ivtv.h | 0
include/{ => uapi}/linux/ivtvfb.h | 0
include/{ => uapi}/linux/ixjuser.h | 0
include/{ => uapi}/linux/jffs2.h | 0
include/uapi/linux/joystick.h | 136 ++
include/uapi/linux/kd.h | 183 +++
include/uapi/linux/kdev_t.h | 13 +
include/uapi/linux/kernel-page-flags.h | 36 +
include/uapi/linux/kernel.h | 13 +
include/uapi/linux/kernelcapi.h | 47 +
include/uapi/linux/kexec.h | 54 +
include/uapi/linux/keyboard.h | 443 ++++++
include/{ => uapi}/linux/keyctl.h | 0
include/{ => uapi}/linux/kvm.h | 0
include/uapi/linux/kvm_para.h | 28 +
include/uapi/linux/l2tp.h | 180 +++
include/{ => uapi}/linux/limits.h | 0
include/uapi/linux/llc.h | 84 ++
include/uapi/linux/loop.h | 94 ++
include/uapi/linux/lp.h | 100 ++
include/{ => uapi}/linux/magic.h | 0
include/{ => uapi}/linux/major.h | 0
include/{ => uapi}/linux/map_to_7segment.h | 0
include/{ => uapi}/linux/matroxfb.h | 0
include/uapi/linux/mdio.h | 297 ++++
include/{ => uapi}/linux/media.h | 0
include/{ => uapi}/linux/mei.h | 0
include/uapi/linux/mempolicy.h | 64 +
include/{ => uapi}/linux/meye.h | 0
include/uapi/linux/mii.h | 161 ++
include/{ => uapi}/linux/minix_fs.h | 0
include/uapi/linux/mman.h | 13 +
include/{ => uapi}/linux/mmtimer.h | 0
include/{ => uapi}/linux/mqueue.h | 0
include/uapi/linux/mroute.h | 143 ++
include/uapi/linux/mroute6.h | 137 ++
include/uapi/linux/msdos_fs.h | 167 +++
include/uapi/linux/msg.h | 75 +
include/{ => uapi}/linux/mtio.h | 0
include/uapi/linux/n_r3964.h | 98 ++
include/uapi/linux/nbd.h | 77 +
include/{ => uapi}/linux/ncp.h | 0
include/{ => uapi}/linux/ncp_fs.h | 0
include/{ => uapi}/linux/ncp_mount.h | 0
include/{ => uapi}/linux/ncp_no.h | 0
include/{ => uapi}/linux/neighbour.h | 0
include/uapi/linux/net.h | 57 +
include/{ => uapi}/linux/net_dropmon.h | 0
include/{ => uapi}/linux/net_tstamp.h | 0
include/uapi/linux/netdevice.h | 53 +
include/uapi/linux/netfilter.h | 72 +
include/{ => uapi}/linux/netfilter_arp.h | 0
include/uapi/linux/netfilter_bridge.h | 27 +
include/{ => uapi}/linux/netfilter_decnet.h | 0
include/uapi/linux/netfilter_ipv4.h | 81 +
include/uapi/linux/netfilter_ipv6.h | 79 +
include/uapi/linux/netlink.h | 153 ++
include/{ => uapi}/linux/netrom.h | 0
include/{ => uapi}/linux/nfc.h | 0
include/uapi/linux/nfs.h | 131 ++
include/{ => uapi}/linux/nfs2.h | 0
include/uapi/linux/nfs3.h | 97 ++
include/uapi/linux/nfs4.h | 178 +++
include/{ => uapi}/linux/nfs4_mount.h | 0
include/uapi/linux/nfs_fs.h | 61 +
include/uapi/linux/nfs_idmap.h | 65 +
include/{ => uapi}/linux/nfs_mount.h | 0
include/uapi/linux/nfsacl.h | 29 +
include/{ => uapi}/linux/nl80211.h | 0
include/uapi/linux/nubus.h | 244 +++
include/uapi/linux/nvram.h | 16 +
include/{ => uapi}/linux/omap3isp.h | 0
include/uapi/linux/omapfb.h | 222 +++
include/uapi/linux/oom.h | 11 +
include/{ => uapi}/linux/packet_diag.h | 0
include/{ => uapi}/linux/param.h | 0
include/uapi/linux/parport.h | 95 ++
include/uapi/linux/patchkey.h | 37 +
include/uapi/linux/pci.h | 41 +
include/{ => uapi}/linux/pci_regs.h | 0
include/uapi/linux/perf_event.h | 615 ++++++++
include/uapi/linux/personality.h | 69 +
include/{ => uapi}/linux/pfkeyv2.h | 0
include/{ => uapi}/linux/pg.h | 0
include/{ => uapi}/linux/phantom.h | 0
include/uapi/linux/phonet.h | 185 +++
include/{ => uapi}/linux/pkt_cls.h | 0
include/{ => uapi}/linux/pkt_sched.h | 0
include/uapi/linux/pktcdvd.h | 111 ++
include/uapi/linux/pmu.h | 139 ++
include/uapi/linux/poll.h | 1 +
include/{ => uapi}/linux/posix_types.h | 0
include/{ => uapi}/linux/ppdev.h | 0
include/uapi/linux/ppp-comp.h | 93 ++
include/{ => uapi}/linux/ppp-ioctl.h | 0
include/uapi/linux/ppp_defs.h | 150 ++
include/{ => uapi}/linux/pps.h | 0
include/{ => uapi}/linux/prctl.h | 0
include/{ => uapi}/linux/ptp_clock.h | 0
include/uapi/linux/ptrace.h | 81 +
include/{ => uapi}/linux/qnx4_fs.h | 0
include/{ => uapi}/linux/qnxtypes.h | 0
include/uapi/linux/quota.h | 171 +++
include/{ => uapi}/linux/radeonfb.h | 0
include/uapi/linux/random.h | 50 +
include/{ => uapi}/linux/raw.h | 0
include/{ => uapi}/linux/rds.h | 0
include/uapi/linux/reboot.h | 39 +
include/{ => uapi}/linux/reiserfs_fs.h | 0
include/{ => uapi}/linux/reiserfs_xattr.h | 0
include/uapi/linux/resource.h | 80 +
include/uapi/linux/rfkill.h | 107 ++
include/{ => uapi}/linux/romfs_fs.h | 0
include/{ => uapi}/linux/rose.h | 0
include/{ => uapi}/linux/route.h | 0
include/uapi/linux/rtc.h | 107 ++
include/uapi/linux/rtnetlink.h | 612 ++++++++
include/uapi/linux/scc.h | 172 +++
include/uapi/linux/sched.h | 46 +
include/uapi/linux/screen_info.h | 74 +
include/uapi/linux/sdla.h | 116 ++
include/uapi/linux/seccomp.h | 47 +
include/uapi/linux/securebits.h | 51 +
include/{ => uapi}/linux/selinux_netlink.h | 0
include/uapi/linux/sem.h | 80 +
include/uapi/linux/serial.h | 126 ++
include/uapi/linux/serial_core.h | 219 +++
include/{ => uapi}/linux/serial_reg.h | 0
include/uapi/linux/serio.h | 80 +
include/uapi/linux/shm.h | 79 +
include/uapi/linux/signal.h | 8 +
include/uapi/linux/signalfd.h | 52 +
include/{ => uapi}/linux/snmp.h | 0
include/uapi/linux/sock_diag.h | 26 +
include/uapi/linux/socket.h | 21 +
include/{ => uapi}/linux/sockios.h | 0
include/{ => uapi}/linux/som.h | 0
include/uapi/linux/sonet.h | 60 +
include/uapi/linux/sonypi.h | 146 ++
include/uapi/linux/sound.h | 31 +
include/uapi/linux/soundcard.h | 1282 ++++++++++++++++
include/uapi/linux/stat.h | 45 +
include/uapi/linux/stddef.h | 1 +
include/uapi/linux/string.h | 9 +
include/{ => uapi}/linux/suspend_ioctls.h | 0
include/uapi/linux/swab.h | 282 ++++
include/uapi/linux/synclink.h | 300 ++++
include/uapi/linux/sysctl.h | 932 ++++++++++++
include/{ => uapi}/linux/sysinfo.h | 0
include/{ => uapi}/linux/taskstats.h | 0
include/uapi/linux/tcp.h | 225 +++
include/{ => uapi}/linux/tcp_metrics.h | 0
include/{ => uapi}/linux/telephony.h | 0
include/{ => uapi}/linux/termios.h | 0
include/uapi/linux/time.h | 71 +
include/{ => uapi}/linux/times.h | 0
include/uapi/linux/timex.h | 166 ++
include/{ => uapi}/linux/tiocl.h | 0
include/{ => uapi}/linux/tipc.h | 0
include/{ => uapi}/linux/tipc_config.h | 0
include/uapi/linux/toshiba.h | 37 +
include/uapi/linux/tty.h | 38 +
include/{ => uapi}/linux/tty_flags.h | 0
include/uapi/linux/types.h | 56 +
include/{ => uapi}/linux/udf_fs_i.h | 0
include/uapi/linux/udp.h | 39 +
include/{ => uapi}/linux/uhid.h | 0
include/uapi/linux/uinput.h | 137 ++
include/uapi/linux/uio.h | 30 +
include/{ => uapi}/linux/ultrasound.h | 0
include/{ => uapi}/linux/un.h | 0
include/{ => uapi}/linux/unistd.h | 0
include/{ => uapi}/linux/unix_diag.h | 0
include/uapi/linux/usbdevice_fs.h | 180 +++
include/{ => uapi}/linux/utime.h | 0
include/uapi/linux/utsname.h | 34 +
include/uapi/linux/uuid.h | 58 +
include/{ => uapi}/linux/uvcvideo.h | 0
include/{ => uapi}/linux/v4l2-common.h | 0
include/{ => uapi}/linux/v4l2-controls.h | 0
include/{ => uapi}/linux/v4l2-dv-timings.h | 0
include/{ => uapi}/linux/v4l2-mediabus.h | 0
include/{ => uapi}/linux/v4l2-subdev.h | 0
include/{ => uapi}/linux/veth.h | 0
include/uapi/linux/vfio.h | 368 +++++
include/{ => uapi}/linux/vhost.h | 0
include/uapi/linux/videodev2.h | 1998 +++++++++++++++++++++++++
include/{ => uapi}/linux/virtio_9p.h | 0
include/{ => uapi}/linux/virtio_balloon.h | 0
include/{ => uapi}/linux/virtio_blk.h | 0
include/uapi/linux/virtio_config.h | 54 +
include/uapi/linux/virtio_console.h | 74 +
include/{ => uapi}/linux/virtio_ids.h | 0
include/{ => uapi}/linux/virtio_net.h | 0
include/{ => uapi}/linux/virtio_pci.h | 0
include/uapi/linux/virtio_ring.h | 163 ++
include/{ => uapi}/linux/virtio_rng.h | 0
include/uapi/linux/vt.h | 90 ++
include/uapi/linux/wait.h | 21 +
include/uapi/linux/wanrouter.h | 452 ++++++
include/uapi/linux/watchdog.h | 57 +
include/{ => uapi}/linux/wimax.h | 0
include/uapi/linux/wireless.h | 1128 ++++++++++++++
include/{ => uapi}/linux/x25.h | 0
include/uapi/linux/xattr.h | 64 +
include/{ => uapi}/linux/xfrm.h | 0
tools/vm/page-types.c | 2 +-
583 files changed, 32928 insertions(+), 30367 deletions(-)
create mode 100644 include/uapi/linux/a.out.h
create mode 100644 include/uapi/linux/acct.h
create mode 100644 include/uapi/linux/adb.h
create mode 100644 include/uapi/linux/adfs_fs.h
rename include/{ => uapi}/linux/affs_hardblocks.h (100%)
create mode 100644 include/uapi/linux/agpgart.h
rename include/{ => uapi}/linux/aio_abi.h (100%)
create mode 100644 include/uapi/linux/apm_bios.h
rename include/{ => uapi}/linux/arcfb.h (100%)
create mode 100644 include/uapi/linux/atalk.h
create mode 100644 include/uapi/linux/atm.h
rename include/{ => uapi}/linux/atm_eni.h (100%)
rename include/{ => uapi}/linux/atm_he.h (100%)
rename include/{ => uapi}/linux/atm_idt77105.h (100%)
rename include/{ => uapi}/linux/atm_nicstar.h (100%)
create mode 100644 include/uapi/linux/atm_tcp.h
rename include/{ => uapi}/linux/atm_zatm.h (100%)
rename include/{ => uapi}/linux/atmapi.h (100%)
rename include/{ => uapi}/linux/atmarp.h (100%)
rename include/{ => uapi}/linux/atmbr2684.h (100%)
rename include/{ => uapi}/linux/atmclip.h (100%)
create mode 100644 include/uapi/linux/atmdev.h
rename include/{ => uapi}/linux/atmioc.h (100%)
rename include/{ => uapi}/linux/atmlec.h (100%)
rename include/{ => uapi}/linux/atmmpc.h (100%)
rename include/{ => uapi}/linux/atmppp.h (100%)
rename include/{ => uapi}/linux/atmsap.h (100%)
rename include/{ => uapi}/linux/atmsvc.h (100%)
create mode 100644 include/uapi/linux/audit.h
create mode 100644 include/uapi/linux/auto_fs.h
rename include/{ => uapi}/linux/auto_fs4.h (100%)
create mode 100644 include/uapi/linux/auxvec.h
rename include/{ => uapi}/linux/ax25.h (100%)
rename include/{ => uapi}/linux/b1lli.h (100%)
rename include/{ => uapi}/linux/baycom.h (100%)
rename include/{ => uapi}/linux/bfs_fs.h (100%)
create mode 100644 include/uapi/linux/binfmts.h
rename include/{ => uapi}/linux/blkpg.h (100%)
create mode 100644 include/uapi/linux/blktrace_api.h
rename include/{ => uapi}/linux/bpqether.h (100%)
create mode 100644 include/uapi/linux/bsg.h
create mode 100644 include/uapi/linux/byteorder/big_endian.h
create mode 100644 include/uapi/linux/byteorder/little_endian.h
rename include/{ => uapi}/linux/can.h (100%)
create mode 100644 include/uapi/linux/capability.h
rename include/{ => uapi}/linux/capi.h (100%)
rename include/{ => uapi}/linux/cciss_defs.h (100%)
create mode 100644 include/uapi/linux/cciss_ioctl.h
create mode 100644 include/uapi/linux/cdrom.h
rename include/{ => uapi}/linux/cgroupstats.h (100%)
rename include/{ => uapi}/linux/chio.h (100%)
create mode 100644 include/uapi/linux/cm4000_cs.h
create mode 100644 include/uapi/linux/cn_proc.h
create mode 100644 include/uapi/linux/coda.h
create mode 100644 include/uapi/linux/coda_psdev.h
rename include/{ => uapi}/linux/coff.h (100%)
create mode 100644 include/uapi/linux/connector.h
rename include/{ => uapi}/linux/const.h (100%)
create mode 100644 include/uapi/linux/cramfs_fs.h
create mode 100644 include/uapi/linux/cuda.h
create mode 100644 include/uapi/linux/cyclades.h
rename include/{ => uapi}/linux/cycx_cfm.h (100%)
rename include/{ => uapi}/linux/dcbnl.h (100%)
create mode 100644 include/uapi/linux/dccp.h
create mode 100644 include/uapi/linux/dlm.h
rename include/{ => uapi}/linux/dlm_device.h (100%)
rename include/{ => uapi}/linux/dlm_netlink.h (100%)
create mode 100644 include/uapi/linux/dlm_plock.h
rename include/{ => uapi}/linux/dlmconstants.h (100%)
rename include/{ => uapi}/linux/dm-ioctl.h (100%)
rename include/{ => uapi}/linux/dm-log-userspace.h (100%)
rename include/{ => uapi}/linux/dn.h (100%)
rename include/{ => uapi}/linux/dqblk_xfs.h (100%)
create mode 100644 include/uapi/linux/edd.h
rename include/{ => uapi}/linux/efs_fs_sb.h (100%)
rename include/{ => uapi}/linux/elf-em.h (100%)
rename include/{ => uapi}/linux/elf-fdpic.h (99%)
create mode 100644 include/uapi/linux/elf.h
create mode 100644 include/uapi/linux/elfcore.h
create mode 100644 include/uapi/linux/errno.h
create mode 100644 include/uapi/linux/errqueue.h
create mode 100644 include/uapi/linux/ethtool.h
create mode 100644 include/uapi/linux/eventpoll.h
rename include/{ => uapi}/linux/fadvise.h (100%)
create mode 100644 include/uapi/linux/falloc.h
create mode 100644 include/uapi/linux/fanotify.h
create mode 100644 include/uapi/linux/fb.h
create mode 100644 include/uapi/linux/fcntl.h
create mode 100644 include/uapi/linux/fd.h
rename include/{ => uapi}/linux/fdreg.h (100%)
rename include/{ => uapi}/linux/fib_rules.h (100%)
rename include/{ => uapi}/linux/fiemap.h (100%)
create mode 100644 include/uapi/linux/filter.h
rename include/{ => uapi}/linux/firewire-cdev.h (100%)
rename include/{ => uapi}/linux/firewire-constants.h (100%)
create mode 100644 include/uapi/linux/flat.h
create mode 100644 include/uapi/linux/fs.h
create mode 100644 include/uapi/linux/fsl_hypervisor.h
rename include/{ => uapi}/linux/fuse.h (100%)
create mode 100644 include/uapi/linux/futex.h
create mode 100644 include/uapi/linux/gameport.h
rename include/{ => uapi}/linux/gen_stats.h (100%)
create mode 100644 include/uapi/linux/genetlink.h
rename include/{ => uapi}/linux/gfs2_ondisk.h (100%)
rename include/{ => uapi}/linux/gigaset_dev.h (100%)
create mode 100644 include/uapi/linux/hdlc.h
create mode 100644 include/uapi/linux/hdlcdrv.h
rename include/{ => uapi}/linux/hdreg.h (100%)
create mode 100644 include/uapi/linux/hid.h
create mode 100644 include/uapi/linux/hiddev.h
create mode 100644 include/uapi/linux/hidraw.h
create mode 100644 include/uapi/linux/hpet.h
rename include/{ => uapi}/linux/hysdn_if.h (100%)
create mode 100644 include/uapi/linux/i2c-dev.h
create mode 100644 include/uapi/linux/i2c.h
rename include/{ => uapi}/linux/i2o-dev.h (100%)
rename include/{ => uapi}/linux/i8k.h (100%)
create mode 100644 include/uapi/linux/icmp.h
create mode 100644 include/uapi/linux/icmpv6.h
rename include/{ => uapi}/linux/if.h (100%)
rename include/{ => uapi}/linux/if_addr.h (100%)
rename include/{ => uapi}/linux/if_addrlabel.h (100%)
rename include/{ => uapi}/linux/if_alg.h (100%)
rename include/{ => uapi}/linux/if_arcnet.h (100%)
create mode 100644 include/uapi/linux/if_arp.h
rename include/{ => uapi}/linux/if_bonding.h (100%)
create mode 100644 include/uapi/linux/if_bridge.h
rename include/{ => uapi}/linux/if_cablemodem.h (100%)
create mode 100644 include/uapi/linux/if_eql.h
create mode 100644 include/uapi/linux/if_ether.h
rename include/{ => uapi}/linux/if_fc.h (100%)
create mode 100644 include/uapi/linux/if_fddi.h
create mode 100644 include/uapi/linux/if_frad.h
rename include/{ => uapi}/linux/if_hippi.h (100%)
rename include/{ => uapi}/linux/if_infiniband.h (100%)
create mode 100644 include/uapi/linux/if_link.h
create mode 100644 include/uapi/linux/if_ltalk.h
rename include/{ => uapi}/linux/if_packet.h (100%)
create mode 100644 include/uapi/linux/if_phonet.h
rename include/{ => uapi}/linux/if_plip.h (100%)
rename include/{ => uapi}/linux/if_ppp.h (100%)
create mode 100644 include/uapi/linux/if_pppol2tp.h
create mode 100644 include/uapi/linux/if_pppox.h
rename include/{ => uapi}/linux/if_slip.h (100%)
create mode 100644 include/uapi/linux/if_team.h
create mode 100644 include/uapi/linux/if_tun.h
create mode 100644 include/uapi/linux/if_tunnel.h
create mode 100644 include/uapi/linux/if_vlan.h
rename include/{ => uapi}/linux/if_x25.h (100%)
create mode 100644 include/uapi/linux/igmp.h
create mode 100644 include/uapi/linux/in.h
create mode 100644 include/uapi/linux/in6.h
rename include/{ => uapi}/linux/in_route.h (100%)
create mode 100644 include/uapi/linux/inet_diag.h
create mode 100644 include/uapi/linux/inotify.h
create mode 100644 include/uapi/linux/input.h
rename include/{ => uapi}/linux/ioctl.h (100%)
create mode 100644 include/uapi/linux/ip.h
rename include/{ => uapi}/linux/ip6_tunnel.h (100%)
rename include/{ => uapi}/linux/ip_vs.h (100%)
create mode 100644 include/uapi/linux/ipc.h
create mode 100644 include/uapi/linux/ipmi.h
rename include/{ => uapi}/linux/ipmi_msgdefs.h (100%)
rename include/{ => uapi}/linux/ipsec.h (100%)
create mode 100644 include/uapi/linux/ipv6.h
create mode 100644 include/uapi/linux/ipv6_route.h
rename include/{ => uapi}/linux/ipx.h (100%)
rename include/{ => uapi}/linux/irda.h (100%)
create mode 100644 include/uapi/linux/irqnr.h
create mode 100644 include/uapi/linux/isdn.h
create mode 100644 include/uapi/linux/isdn_divertif.h
create mode 100644 include/uapi/linux/isdn_ppp.h
create mode 100644 include/uapi/linux/isdnif.h
rename include/{ => uapi}/linux/iso_fs.h (100%)
rename include/{ => uapi}/linux/ivtv.h (100%)
rename include/{ => uapi}/linux/ivtvfb.h (100%)
rename include/{ => uapi}/linux/ixjuser.h (100%)
rename include/{ => uapi}/linux/jffs2.h (100%)
create mode 100644 include/uapi/linux/joystick.h
create mode 100644 include/uapi/linux/kd.h
create mode 100644 include/uapi/linux/kdev_t.h
create mode 100644 include/uapi/linux/kernel-page-flags.h
create mode 100644 include/uapi/linux/kernel.h
create mode 100644 include/uapi/linux/kernelcapi.h
create mode 100644 include/uapi/linux/kexec.h
create mode 100644 include/uapi/linux/keyboard.h
rename include/{ => uapi}/linux/keyctl.h (100%)
rename include/{ => uapi}/linux/kvm.h (100%)
create mode 100644 include/uapi/linux/kvm_para.h
create mode 100644 include/uapi/linux/l2tp.h
rename include/{ => uapi}/linux/limits.h (100%)
create mode 100644 include/uapi/linux/llc.h
create mode 100644 include/uapi/linux/loop.h
create mode 100644 include/uapi/linux/lp.h
rename include/{ => uapi}/linux/magic.h (100%)
rename include/{ => uapi}/linux/major.h (100%)
rename include/{ => uapi}/linux/map_to_7segment.h (100%)
rename include/{ => uapi}/linux/matroxfb.h (100%)
create mode 100644 include/uapi/linux/mdio.h
rename include/{ => uapi}/linux/media.h (100%)
rename include/{ => uapi}/linux/mei.h (100%)
create mode 100644 include/uapi/linux/mempolicy.h
rename include/{ => uapi}/linux/meye.h (100%)
create mode 100644 include/uapi/linux/mii.h
rename include/{ => uapi}/linux/minix_fs.h (100%)
create mode 100644 include/uapi/linux/mman.h
rename include/{ => uapi}/linux/mmtimer.h (100%)
rename include/{ => uapi}/linux/mqueue.h (100%)
create mode 100644 include/uapi/linux/mroute.h
create mode 100644 include/uapi/linux/mroute6.h
create mode 100644 include/uapi/linux/msdos_fs.h
create mode 100644 include/uapi/linux/msg.h
rename include/{ => uapi}/linux/mtio.h (100%)
create mode 100644 include/uapi/linux/n_r3964.h
create mode 100644 include/uapi/linux/nbd.h
rename include/{ => uapi}/linux/ncp.h (100%)
rename include/{ => uapi}/linux/ncp_fs.h (100%)
rename include/{ => uapi}/linux/ncp_mount.h (100%)
rename include/{ => uapi}/linux/ncp_no.h (100%)
rename include/{ => uapi}/linux/neighbour.h (100%)
create mode 100644 include/uapi/linux/net.h
rename include/{ => uapi}/linux/net_dropmon.h (100%)
rename include/{ => uapi}/linux/net_tstamp.h (100%)
create mode 100644 include/uapi/linux/netdevice.h
create mode 100644 include/uapi/linux/netfilter.h
rename include/{ => uapi}/linux/netfilter_arp.h (100%)
create mode 100644 include/uapi/linux/netfilter_bridge.h
rename include/{ => uapi}/linux/netfilter_decnet.h (100%)
create mode 100644 include/uapi/linux/netfilter_ipv4.h
create mode 100644 include/uapi/linux/netfilter_ipv6.h
create mode 100644 include/uapi/linux/netlink.h
rename include/{ => uapi}/linux/netrom.h (100%)
rename include/{ => uapi}/linux/nfc.h (100%)
create mode 100644 include/uapi/linux/nfs.h
rename include/{ => uapi}/linux/nfs2.h (100%)
create mode 100644 include/uapi/linux/nfs3.h
create mode 100644 include/uapi/linux/nfs4.h
rename include/{ => uapi}/linux/nfs4_mount.h (100%)
create mode 100644 include/uapi/linux/nfs_fs.h
create mode 100644 include/uapi/linux/nfs_idmap.h
rename include/{ => uapi}/linux/nfs_mount.h (100%)
create mode 100644 include/uapi/linux/nfsacl.h
rename include/{ => uapi}/linux/nl80211.h (100%)
create mode 100644 include/uapi/linux/nubus.h
create mode 100644 include/uapi/linux/nvram.h
rename include/{ => uapi}/linux/omap3isp.h (100%)
create mode 100644 include/uapi/linux/omapfb.h
create mode 100644 include/uapi/linux/oom.h
rename include/{ => uapi}/linux/packet_diag.h (100%)
rename include/{ => uapi}/linux/param.h (100%)
create mode 100644 include/uapi/linux/parport.h
create mode 100644 include/uapi/linux/patchkey.h
create mode 100644 include/uapi/linux/pci.h
rename include/{ => uapi}/linux/pci_regs.h (100%)
create mode 100644 include/uapi/linux/perf_event.h
create mode 100644 include/uapi/linux/personality.h
rename include/{ => uapi}/linux/pfkeyv2.h (100%)
rename include/{ => uapi}/linux/pg.h (100%)
rename include/{ => uapi}/linux/phantom.h (100%)
create mode 100644 include/uapi/linux/phonet.h
rename include/{ => uapi}/linux/pkt_cls.h (100%)
rename include/{ => uapi}/linux/pkt_sched.h (100%)
create mode 100644 include/uapi/linux/pktcdvd.h
create mode 100644 include/uapi/linux/pmu.h
create mode 100644 include/uapi/linux/poll.h
rename include/{ => uapi}/linux/posix_types.h (100%)
rename include/{ => uapi}/linux/ppdev.h (100%)
create mode 100644 include/uapi/linux/ppp-comp.h
rename include/{ => uapi}/linux/ppp-ioctl.h (100%)
create mode 100644 include/uapi/linux/ppp_defs.h
rename include/{ => uapi}/linux/pps.h (100%)
rename include/{ => uapi}/linux/prctl.h (100%)
rename include/{ => uapi}/linux/ptp_clock.h (100%)
create mode 100644 include/uapi/linux/ptrace.h
rename include/{ => uapi}/linux/qnx4_fs.h (100%)
rename include/{ => uapi}/linux/qnxtypes.h (100%)
create mode 100644 include/uapi/linux/quota.h
rename include/{ => uapi}/linux/radeonfb.h (100%)
create mode 100644 include/uapi/linux/random.h
rename include/{ => uapi}/linux/raw.h (100%)
rename include/{ => uapi}/linux/rds.h (100%)
create mode 100644 include/uapi/linux/reboot.h
rename include/{ => uapi}/linux/reiserfs_fs.h (100%)
rename include/{ => uapi}/linux/reiserfs_xattr.h (100%)
create mode 100644 include/uapi/linux/resource.h
create mode 100644 include/uapi/linux/rfkill.h
rename include/{ => uapi}/linux/romfs_fs.h (100%)
rename include/{ => uapi}/linux/rose.h (100%)
rename include/{ => uapi}/linux/route.h (100%)
create mode 100644 include/uapi/linux/rtc.h
create mode 100644 include/uapi/linux/rtnetlink.h
create mode 100644 include/uapi/linux/scc.h
create mode 100644 include/uapi/linux/sched.h
create mode 100644 include/uapi/linux/screen_info.h
create mode 100644 include/uapi/linux/sdla.h
create mode 100644 include/uapi/linux/seccomp.h
create mode 100644 include/uapi/linux/securebits.h
rename include/{ => uapi}/linux/selinux_netlink.h (100%)
create mode 100644 include/uapi/linux/sem.h
create mode 100644 include/uapi/linux/serial.h
create mode 100644 include/uapi/linux/serial_core.h
rename include/{ => uapi}/linux/serial_reg.h (100%)
create mode 100644 include/uapi/linux/serio.h
create mode 100644 include/uapi/linux/shm.h
create mode 100644 include/uapi/linux/signal.h
create mode 100644 include/uapi/linux/signalfd.h
rename include/{ => uapi}/linux/snmp.h (100%)
create mode 100644 include/uapi/linux/sock_diag.h
create mode 100644 include/uapi/linux/socket.h
rename include/{ => uapi}/linux/sockios.h (100%)
rename include/{ => uapi}/linux/som.h (100%)
create mode 100644 include/uapi/linux/sonet.h
create mode 100644 include/uapi/linux/sonypi.h
create mode 100644 include/uapi/linux/sound.h
create mode 100644 include/uapi/linux/soundcard.h
create mode 100644 include/uapi/linux/stat.h
create mode 100644 include/uapi/linux/stddef.h
create mode 100644 include/uapi/linux/string.h
rename include/{ => uapi}/linux/suspend_ioctls.h (100%)
create mode 100644 include/uapi/linux/swab.h
create mode 100644 include/uapi/linux/synclink.h
create mode 100644 include/uapi/linux/sysctl.h
rename include/{ => uapi}/linux/sysinfo.h (100%)
rename include/{ => uapi}/linux/taskstats.h (100%)
create mode 100644 include/uapi/linux/tcp.h
rename include/{ => uapi}/linux/tcp_metrics.h (100%)
rename include/{ => uapi}/linux/telephony.h (100%)
rename include/{ => uapi}/linux/termios.h (100%)
create mode 100644 include/uapi/linux/time.h
rename include/{ => uapi}/linux/times.h (100%)
create mode 100644 include/uapi/linux/timex.h
rename include/{ => uapi}/linux/tiocl.h (100%)
rename include/{ => uapi}/linux/tipc.h (100%)
rename include/{ => uapi}/linux/tipc_config.h (100%)
create mode 100644 include/uapi/linux/toshiba.h
create mode 100644 include/uapi/linux/tty.h
rename include/{ => uapi}/linux/tty_flags.h (100%)
create mode 100644 include/uapi/linux/types.h
rename include/{ => uapi}/linux/udf_fs_i.h (100%)
create mode 100644 include/uapi/linux/udp.h
rename include/{ => uapi}/linux/uhid.h (100%)
create mode 100644 include/uapi/linux/uinput.h
create mode 100644 include/uapi/linux/uio.h
rename include/{ => uapi}/linux/ultrasound.h (100%)
rename include/{ => uapi}/linux/un.h (100%)
rename include/{ => uapi}/linux/unistd.h (100%)
rename include/{ => uapi}/linux/unix_diag.h (100%)
create mode 100644 include/uapi/linux/usbdevice_fs.h
rename include/{ => uapi}/linux/utime.h (100%)
create mode 100644 include/uapi/linux/utsname.h
create mode 100644 include/uapi/linux/uuid.h
rename include/{ => uapi}/linux/uvcvideo.h (100%)
rename include/{ => uapi}/linux/v4l2-common.h (100%)
rename include/{ => uapi}/linux/v4l2-controls.h (100%)
rename include/{ => uapi}/linux/v4l2-dv-timings.h (100%)
rename include/{ => uapi}/linux/v4l2-mediabus.h (100%)
rename include/{ => uapi}/linux/v4l2-subdev.h (100%)
rename include/{ => uapi}/linux/veth.h (100%)
create mode 100644 include/uapi/linux/vfio.h
rename include/{ => uapi}/linux/vhost.h (100%)
create mode 100644 include/uapi/linux/videodev2.h
rename include/{ => uapi}/linux/virtio_9p.h (100%)
rename include/{ => uapi}/linux/virtio_balloon.h (100%)
rename include/{ => uapi}/linux/virtio_blk.h (100%)
create mode 100644 include/uapi/linux/virtio_config.h
create mode 100644 include/uapi/linux/virtio_console.h
rename include/{ => uapi}/linux/virtio_ids.h (100%)
rename include/{ => uapi}/linux/virtio_net.h (100%)
rename include/{ => uapi}/linux/virtio_pci.h (100%)
create mode 100644 include/uapi/linux/virtio_ring.h
rename include/{ => uapi}/linux/virtio_rng.h (100%)
create mode 100644 include/uapi/linux/vt.h
create mode 100644 include/uapi/linux/wait.h
create mode 100644 include/uapi/linux/wanrouter.h
create mode 100644 include/uapi/linux/watchdog.h
rename include/{ => uapi}/linux/wimax.h (100%)
create mode 100644 include/uapi/linux/wireless.h
rename include/{ => uapi}/linux/x25.h (100%)
create mode 100644 include/uapi/linux/xattr.h
rename include/{ => uapi}/linux/xfrm.h (100%)David,
I want to make it very clear that if you *ever* suggest another big
include file cleanup, I will say "f*ck no" and block you from my emails forever. Ok? So don't bother. We're done with these kinds of games. Forever. It's not worth it, don't ever suggest it again for some other "cleanup".
In the meantime, please fix the fact that "tools/perf" broke. I suspect the only way to fix it is to teach perf to be compiled with the proper "-I" incantation and a lot of header file changes. Right now it uses things like
#include "../../../include/linux/perf_event.h"
which was broken by this pull. Sadly, I noticed too late, and the broken mess is long pushed out.
Linus
PATCH 1/1 perf: Fix UAPI fallout
Find below a stab at that, lightly tested.
Arnaldo: the way we include some of the include files directly into tools/perf/ .c files [such as hw_breakpoint.h] and represent others transparently via utils/include/ [such as rbtree.h] is a bit messy and ought to be cleaned up I suspect.
What we want in .c files are not ../.. inclusions but the 'seemless' <linux/abc.h> inclusions. Which is the overwhelming majority, gladly. Do we want to make that the 100% majority?
We should probably also think about how to represent kernel versus UAPI headers in tools/perf/, plus the /usr/include/linux/ headers which are always an option to get picked up.
I think the best model would be to cleanly separate from any /usr/include/linux/ muck, which might be out of sync, and which might stand in the way of changes. Is it possible to exclude all of /usr/include/ and try to build purely from include/uapi/linux/, with a few exceptions (with clearly distinctive patterns) where we [currently] need to pick up include/linux/ headers, such as hw_breakpoint.h or rbtree.h?
This would clean up the code and would also make it easier to drive UAPI conversions: the bits that we still pick up from include/linux/ are candidates for (incremental, slow, well tested, please) UAPI conversions.
Thanks,
Ingo
------------>
Quoted 1 line
From
957e49e521292324053809bb73173b82d9e42464Mon Sep 17 00:00:00 2001
From: Ingo Molnar <[email protected]>
Date: Sun, 14 Oct 2012 10:40:57 +0200
Subject: [PATCH] perf: Fix UAPI fallout
The UAPI commits forgot to test tooling builds such as tools/perf/, and this fixes the fallout.
Manual conversion.
Signed-off-by Ingo Molnar <[email protected]>
--- tools/perf/Makefile | 4 ++-- tools/perf/perf.h | 2 +- tools/perf/util/evsel.c | 2 +- tools/perf/util/evsel.h | 2 +- tools/perf/util/header.h | 2 +- tools/perf/util/include/asm/byteorder.h | 2 +- tools/perf/util/include/linux/const.h | 2 +- tools/perf/util/parse-events.h | 2 +- tools/perf/util/pmu.h | 2 +- tools/perf/util/session.h | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-)
tools/perf/Makefile +2 -2
@@ -252,10 +252,10 @@ $(OUTPUT)util/pmu.o: $(OUTPUT)util/pmu-flex.c $(OUTPUT)util/pmu-bison.c LIB_FILE=$(OUTPUT)libperf.a -LIB_H += ../../include/linux/perf_event.h +LIB_H += ../../include/uapi/linux/perf_event.h LIB_H += ../../include/linux/rbtree.h LIB_H += ../../include/linux/list.h -LIB_H += ../../include/linux/const.h +LIB_H += ../../include/uapi/linux/const.h LIB_H += ../../include/linux/hash.h LIB_H += ../../include/linux/stringify.h LIB_H += util/include/linux/bitmap.h
tools/perf/perf.h +1 -1
@@ -112,7 +112,7 @@ void get_term_dimensions(struct winsize *ws);#include <sys/types.h> #include <sys/syscall.h> -#include "../../include/linux/perf_event.h" +#include "../../include/uapi/linux/perf_event.h" #include "util/types.h" #include <stdbool.h>
tools/perf/util/evsel.c +1 -1
@@ -19,7 +19,7 @@#include "thread_map.h" #include "target.h" #include "../../../include/linux/hw_breakpoint.h" -#include "../../include/linux/perf_event.h" +#include "../../../include/uapi/linux/perf_event.h" #include "perf_regs.h" #define FD (e, x, y) (*(int *)xyarray__entry(e->fd, x, y))
tools/perf/util/evsel.h +1 -1
@@ -3,7 +3,7 @@#include <linux/list.h> #include <stdbool.h> -#include "../../../include/linux/perf_event.h" +#include "../../../include/uapi/linux/perf_event.h" #include "types.h" #include "xyarray.h" #include "cgroup.h"
tools/perf/util/header.h +1 -1
@@ -1,7 +1,7 @@#ifndef __PERF_HEADER_H#define __PERF_HEADER_H -#include "../../../include/linux/perf_event.h" +#include "../../../include/uapi/linux/perf_event.h" #include <sys/types.h> #include <stdbool.h> #include "types.h"
tools/perf/util/include/asm/byteorder.h +1 -1
@@ -1,2 +1,2 @@#include <asm/types.h> -#include "../../../../include/linux/swab.h" +#include "../../../../include/uapi/linux/swab.h"
tools/perf/util/include/linux/const.h +1 -1
@@ -1 +1 @@ -#include "../../../../include/linux/const.h" +#include "../../../../include/uapi/linux/const.h"
tools/perf/util/parse-events.h +1 -1
@@ -7,7 +7,7 @@#include <linux/list.h> #include <stdbool.h> #include "types.h" -#include "../../../include/linux/perf_event.h" +#include "../../../include/uapi/linux/perf_event.h" #include "types.h" struct list_head ;
tools/perf/util/pmu.h +1 -1
@@ -2,7 +2,7 @@#define __PMU_H#include <linux/bitops.h> -#include "../../../include/linux/perf_event.h" +#include "../../../include/uapi/linux/perf_event.h" enum {PERF_PMU_FORMAT_VALUE_CONFIG ,
tools/perf/util/session.h +1 -1
@@ -7,7 +7,7 @@#include "symbol.h" #include "thread.h" #include <linux/rbtree.h> -#include "../../../include/linux/perf_event.h" +#include "../../../include/uapi/linux/perf_event.h" struct sample_queue ;struct ip_callchain ;
Re: [PATCH] perf: Fix UAPI fallout
From: Ingo Molnar <[email protected]>
Date: Sun, 14 Oct 2012 10:56:17 +0200
Quoted 1 line
Find below a stab at that, lightly tested.
Thanks for doing this.
tools/perf/perf.h void get_term_dimensions(struct winsize *ws); · line 118
Quoted 13 lines
tools/perf/perf.h +1
-1@@ -112,7 +112,7 @@ void get_term_dimensions(struct winsize *ws);#include <sys/types.h> #include <sys/syscall.h> -#include "../../include/linux/perf_event.h" +#include "../../include/uapi/linux/perf_event.h" #include "util/types.h" #include <stdbool.h>
Each arch stanza in this header will also need the asm/unistd.h header path adjusted to the UAPI one.
In fact, that's the only thing that broke the build for me.
Re: [PATCH] perf: Fix UAPI fallout
In reply to Ingo MolnarQuoted 4 lines · Ingo Molnar
Arnaldo: the way we include some of the include files directly into
tools/perf/.c files [such ashw_breakpoint.h] and represent others transparently via utils/include/ [such asrbtree.h] is a bit messy and ought to be cleaned up I suspect.
I tried to make the USERINCLUDE macro in the bottom-level Makefile that, but I didn't realise I had to export it:-(.
That, however, also brings in linux/kconfig.h but I don't know whether you want/need that.
Quoted 5 lines
I think the best model would be to cleanly separate from any
/usr/include/linux/muck, which might be out of sync, and which might stand in the way of changes. Is it possible to exclude all of/usr/include/and try to build purely frominclude/uapi/linux/
You would also need arch/foo/include/uapi/.
David
Re: [PATCH] perf: Fix UAPI fallout
In reply to Ingo MolnarQuoted 3 lines · Ingo Molnar
What we want in .c files are not ../.. inclusions but the 'seemless' <
linux/abc.h> inclusions. Which is the overwhelming majority, gladly. Do we want to make that the 100% majority?
I think this is going to be necessary for when x86 gets merged. x86's asm/unistd.h #includes uapi/asm/unistd.h, so you can't manually specify the header without also specifying a -I flag.
I've been having a prod at it, and this seems to partially work:
-BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)util -I$(TRACE_EVENT_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE +$(info XXX $(srctree)) + +BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I../../arch/$(ARCH)/include -I$(OUTPUT)util -I$(TRACE_EVENT_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
However, I'm trying to work out what will happen if this is run in a separate output dir, but if I do:
make tools/perf O=build_dir
from the bottom directory, I get:
scripts/Makefile.include:2: *** O=build_dir does not exist. Stop.
The problem is that the bottom-level Makefile does this:
tools/: FORCE $(Q)$(MAKE) LDFLAGS= MAKEFLAGS= -C $(src)/tools/ tools/%: FORCE $(Q)$(MAKE) LDFLAGS= MAKEFLAGS= -C $(src)/tools/ $*
which changes the directory, rendering a relative O= that would be good for building the normal kernel useless for building a tool. Should these rules respecify the O= flag here, or should we give an error if someone tries it?
David
Quoted 1 line · Linus Torvalds
In the meantime, please fix the fact that "
tools/perf" broke.
Hmmm... I assumed that would've been built by allyesconfig... Apparently not.
David