]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge tag 'disintegrate-main-20121013' of git://git.infradead.org/users/dhowells...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 20:28:32 +0000 (13:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 20:28:32 +0000 (13:28 -0700)
Pull UAPI disintegration for include/linux/{,byteorder/}*.h from David Howells:
 "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 <dhowells@redhat.com>"
* tag 'disintegrate-main-20121013' of git://git.infradead.org/users/dhowells/linux-headers:
  UAPI: (Scripted) Disintegrate include/linux/byteorder
  UAPI: (Scripted) Disintegrate include/linux
  UAPI: Unexport linux/blk_types.h
  UAPI: Unexport part of linux/ppp-comp.h

765 files changed:
include/linux/Kbuild
include/linux/a.out.h
include/linux/acct.h
include/linux/adb.h
include/linux/adfs_fs.h
include/linux/affs_hardblocks.h [deleted file]
include/linux/agpgart.h
include/linux/aio_abi.h [deleted file]
include/linux/apm_bios.h
include/linux/arcfb.h [deleted file]
include/linux/atalk.h
include/linux/atm.h
include/linux/atm_eni.h [deleted file]
include/linux/atm_he.h [deleted file]
include/linux/atm_idt77105.h [deleted file]
include/linux/atm_nicstar.h [deleted file]
include/linux/atm_tcp.h
include/linux/atm_zatm.h [deleted file]
include/linux/atmapi.h [deleted file]
include/linux/atmarp.h [deleted file]
include/linux/atmbr2684.h [deleted file]
include/linux/atmclip.h [deleted file]
include/linux/atmdev.h
include/linux/atmioc.h [deleted file]
include/linux/atmlec.h [deleted file]
include/linux/atmmpc.h [deleted file]
include/linux/atmppp.h [deleted file]
include/linux/atmsap.h [deleted file]
include/linux/atmsvc.h [deleted file]
include/linux/audit.h
include/linux/auto_fs.h
include/linux/auto_fs4.h [deleted file]
include/linux/auxvec.h
include/linux/ax25.h [deleted file]
include/linux/b1lli.h [deleted file]
include/linux/baycom.h [deleted file]
include/linux/bfs_fs.h [deleted file]
include/linux/binfmts.h
include/linux/blkpg.h [deleted file]
include/linux/blktrace_api.h
include/linux/bpqether.h [deleted file]
include/linux/bsg.h
include/linux/byteorder/Kbuild
include/linux/byteorder/big_endian.h
include/linux/byteorder/little_endian.h
include/linux/can.h [deleted file]
include/linux/capability.h
include/linux/capi.h [deleted file]
include/linux/cciss_defs.h [deleted file]
include/linux/cciss_ioctl.h
include/linux/cdrom.h
include/linux/cgroupstats.h [deleted file]
include/linux/chio.h [deleted file]
include/linux/cm4000_cs.h
include/linux/cn_proc.h
include/linux/coda.h
include/linux/coda_psdev.h
include/linux/coff.h [deleted file]
include/linux/connector.h
include/linux/const.h [deleted file]
include/linux/cramfs_fs.h
include/linux/cuda.h
include/linux/cyclades.h
include/linux/cycx_cfm.h [deleted file]
include/linux/dcbnl.h [deleted file]
include/linux/dccp.h
include/linux/dlm.h
include/linux/dlm_device.h [deleted file]
include/linux/dlm_netlink.h [deleted file]
include/linux/dlm_plock.h
include/linux/dlmconstants.h [deleted file]
include/linux/dm-ioctl.h [deleted file]
include/linux/dm-log-userspace.h [deleted file]
include/linux/dn.h [deleted file]
include/linux/dqblk_xfs.h [deleted file]
include/linux/edd.h
include/linux/efs_fs_sb.h [deleted file]
include/linux/elf-em.h [deleted file]
include/linux/elf-fdpic.h [deleted file]
include/linux/elf.h
include/linux/elfcore.h
include/linux/errno.h
include/linux/errqueue.h
include/linux/ethtool.h
include/linux/eventpoll.h
include/linux/fadvise.h [deleted file]
include/linux/falloc.h
include/linux/fanotify.h
include/linux/fb.h
include/linux/fcntl.h
include/linux/fd.h
include/linux/fdreg.h [deleted file]
include/linux/fib_rules.h [deleted file]
include/linux/fiemap.h [deleted file]
include/linux/filter.h
include/linux/firewire-cdev.h [deleted file]
include/linux/firewire-constants.h [deleted file]
include/linux/flat.h
include/linux/fs.h
include/linux/fsl_hypervisor.h
include/linux/fuse.h [deleted file]
include/linux/futex.h
include/linux/gameport.h
include/linux/gen_stats.h [deleted file]
include/linux/genetlink.h
include/linux/gfs2_ondisk.h [deleted file]
include/linux/gigaset_dev.h [deleted file]
include/linux/hdlc.h
include/linux/hdlcdrv.h
include/linux/hdreg.h [deleted file]
include/linux/hid.h
include/linux/hiddev.h
include/linux/hidraw.h
include/linux/hpet.h
include/linux/hysdn_if.h [deleted file]
include/linux/i2c-dev.h
include/linux/i2c.h
include/linux/i2o-dev.h [deleted file]
include/linux/i8k.h [deleted file]
include/linux/icmp.h
include/linux/icmpv6.h
include/linux/if.h [deleted file]
include/linux/if_addr.h [deleted file]
include/linux/if_addrlabel.h [deleted file]
include/linux/if_alg.h [deleted file]
include/linux/if_arcnet.h [deleted file]
include/linux/if_arp.h
include/linux/if_bonding.h [deleted file]
include/linux/if_bridge.h
include/linux/if_cablemodem.h [deleted file]
include/linux/if_eql.h
include/linux/if_ether.h
include/linux/if_fc.h [deleted file]
include/linux/if_fddi.h
include/linux/if_frad.h
include/linux/if_hippi.h [deleted file]
include/linux/if_infiniband.h [deleted file]
include/linux/if_link.h
include/linux/if_ltalk.h
include/linux/if_packet.h [deleted file]
include/linux/if_phonet.h
include/linux/if_plip.h [deleted file]
include/linux/if_ppp.h [deleted file]
include/linux/if_pppol2tp.h
include/linux/if_pppox.h
include/linux/if_slip.h [deleted file]
include/linux/if_team.h
include/linux/if_tun.h
include/linux/if_tunnel.h
include/linux/if_vlan.h
include/linux/if_x25.h [deleted file]
include/linux/igmp.h
include/linux/in.h
include/linux/in6.h
include/linux/in_route.h [deleted file]
include/linux/inet_diag.h
include/linux/inotify.h
include/linux/input.h
include/linux/ioctl.h [deleted file]
include/linux/ip.h
include/linux/ip6_tunnel.h [deleted file]
include/linux/ip_vs.h [deleted file]
include/linux/ipc.h
include/linux/ipmi.h
include/linux/ipmi_msgdefs.h [deleted file]
include/linux/ipsec.h [deleted file]
include/linux/ipv6.h
include/linux/ipv6_route.h
include/linux/ipx.h [deleted file]
include/linux/irda.h [deleted file]
include/linux/irqnr.h
include/linux/isdn.h
include/linux/isdn_divertif.h
include/linux/isdn_ppp.h
include/linux/isdnif.h
include/linux/iso_fs.h [deleted file]
include/linux/ivtv.h [deleted file]
include/linux/ivtvfb.h [deleted file]
include/linux/ixjuser.h [deleted file]
include/linux/jffs2.h [deleted file]
include/linux/joystick.h
include/linux/kd.h
include/linux/kdev_t.h
include/linux/kernel-page-flags.h
include/linux/kernel.h
include/linux/kernelcapi.h
include/linux/kexec.h
include/linux/keyboard.h
include/linux/keyctl.h [deleted file]
include/linux/kvm.h [deleted file]
include/linux/kvm_para.h
include/linux/l2tp.h
include/linux/limits.h [deleted file]
include/linux/llc.h
include/linux/loop.h
include/linux/lp.h
include/linux/magic.h [deleted file]
include/linux/major.h [deleted file]
include/linux/map_to_7segment.h [deleted file]
include/linux/matroxfb.h [deleted file]
include/linux/mdio.h
include/linux/media.h [deleted file]
include/linux/mei.h [deleted file]
include/linux/mempolicy.h
include/linux/meye.h [deleted file]
include/linux/mii.h
include/linux/minix_fs.h [deleted file]
include/linux/mman.h
include/linux/mmtimer.h [deleted file]
include/linux/mqueue.h [deleted file]
include/linux/mroute.h
include/linux/mroute6.h
include/linux/msdos_fs.h
include/linux/msg.h
include/linux/mtio.h [deleted file]
include/linux/n_r3964.h
include/linux/nbd.h
include/linux/ncp.h [deleted file]
include/linux/ncp_fs.h [deleted file]
include/linux/ncp_mount.h [deleted file]
include/linux/ncp_no.h [deleted file]
include/linux/neighbour.h [deleted file]
include/linux/net.h
include/linux/net_dropmon.h [deleted file]
include/linux/net_tstamp.h [deleted file]
include/linux/netdevice.h
include/linux/netfilter.h
include/linux/netfilter_arp.h [deleted file]
include/linux/netfilter_bridge.h
include/linux/netfilter_decnet.h [deleted file]
include/linux/netfilter_ipv4.h
include/linux/netfilter_ipv6.h
include/linux/netlink.h
include/linux/netrom.h [deleted file]
include/linux/nfc.h [deleted file]
include/linux/nfs.h
include/linux/nfs2.h [deleted file]
include/linux/nfs3.h
include/linux/nfs4.h
include/linux/nfs4_mount.h [deleted file]
include/linux/nfs_fs.h
include/linux/nfs_idmap.h
include/linux/nfs_mount.h [deleted file]
include/linux/nfsacl.h
include/linux/nl80211.h [deleted file]
include/linux/nubus.h
include/linux/nvram.h
include/linux/omap3isp.h [deleted file]
include/linux/omapfb.h
include/linux/oom.h
include/linux/packet_diag.h [deleted file]
include/linux/param.h [deleted file]
include/linux/parport.h
include/linux/patchkey.h
include/linux/pci.h
include/linux/pci_regs.h [deleted file]
include/linux/perf_event.h
include/linux/personality.h
include/linux/pfkeyv2.h [deleted file]
include/linux/pg.h [deleted file]
include/linux/phantom.h [deleted file]
include/linux/phonet.h
include/linux/pkt_cls.h [deleted file]
include/linux/pkt_sched.h [deleted file]
include/linux/pktcdvd.h
include/linux/pmu.h
include/linux/poll.h
include/linux/posix_types.h [deleted file]
include/linux/ppdev.h [deleted file]
include/linux/ppp-comp.h
include/linux/ppp-ioctl.h [deleted file]
include/linux/ppp_defs.h
include/linux/pps.h [deleted file]
include/linux/prctl.h [deleted file]
include/linux/ptp_clock.h [deleted file]
include/linux/ptrace.h
include/linux/qnx4_fs.h [deleted file]
include/linux/qnxtypes.h [deleted file]
include/linux/quota.h
include/linux/radeonfb.h [deleted file]
include/linux/random.h
include/linux/raw.h [deleted file]
include/linux/rds.h [deleted file]
include/linux/reboot.h
include/linux/reiserfs_fs.h [deleted file]
include/linux/reiserfs_xattr.h [deleted file]
include/linux/resource.h
include/linux/rfkill.h
include/linux/romfs_fs.h [deleted file]
include/linux/rose.h [deleted file]
include/linux/route.h [deleted file]
include/linux/rtc.h
include/linux/rtnetlink.h
include/linux/scc.h
include/linux/sched.h
include/linux/screen_info.h
include/linux/sdla.h
include/linux/seccomp.h
include/linux/securebits.h
include/linux/selinux_netlink.h [deleted file]
include/linux/sem.h
include/linux/serial.h
include/linux/serial_core.h
include/linux/serial_reg.h [deleted file]
include/linux/serio.h
include/linux/shm.h
include/linux/signal.h
include/linux/signalfd.h
include/linux/snmp.h [deleted file]
include/linux/sock_diag.h
include/linux/socket.h
include/linux/sockios.h [deleted file]
include/linux/som.h [deleted file]
include/linux/sonet.h
include/linux/sonypi.h
include/linux/sound.h
include/linux/soundcard.h
include/linux/stat.h
include/linux/stddef.h
include/linux/string.h
include/linux/suspend_ioctls.h [deleted file]
include/linux/swab.h
include/linux/synclink.h
include/linux/sysctl.h
include/linux/sysinfo.h [deleted file]
include/linux/taskstats.h [deleted file]
include/linux/tcp.h
include/linux/tcp_metrics.h [deleted file]
include/linux/telephony.h [deleted file]
include/linux/termios.h [deleted file]
include/linux/time.h
include/linux/times.h [deleted file]
include/linux/timex.h
include/linux/tiocl.h [deleted file]
include/linux/tipc.h [deleted file]
include/linux/tipc_config.h [deleted file]
include/linux/toshiba.h
include/linux/tty.h
include/linux/tty_flags.h [deleted file]
include/linux/types.h
include/linux/udf_fs_i.h [deleted file]
include/linux/udp.h
include/linux/uhid.h [deleted file]
include/linux/uinput.h
include/linux/uio.h
include/linux/ultrasound.h [deleted file]
include/linux/un.h [deleted file]
include/linux/unistd.h [deleted file]
include/linux/unix_diag.h [deleted file]
include/linux/usbdevice_fs.h
include/linux/utime.h [deleted file]
include/linux/utsname.h
include/linux/uuid.h
include/linux/uvcvideo.h [deleted file]
include/linux/v4l2-common.h [deleted file]
include/linux/v4l2-controls.h [deleted file]
include/linux/v4l2-dv-timings.h [deleted file]
include/linux/v4l2-mediabus.h [deleted file]
include/linux/v4l2-subdev.h [deleted file]
include/linux/veth.h [deleted file]
include/linux/vfio.h
include/linux/vhost.h [deleted file]
include/linux/videodev2.h
include/linux/virtio_9p.h [deleted file]
include/linux/virtio_balloon.h [deleted file]
include/linux/virtio_blk.h [deleted file]
include/linux/virtio_config.h
include/linux/virtio_console.h
include/linux/virtio_ids.h [deleted file]
include/linux/virtio_net.h [deleted file]
include/linux/virtio_pci.h [deleted file]
include/linux/virtio_ring.h
include/linux/virtio_rng.h [deleted file]
include/linux/vt.h
include/linux/wait.h
include/linux/wanrouter.h
include/linux/watchdog.h
include/linux/wimax.h [deleted file]
include/linux/wireless.h
include/linux/x25.h [deleted file]
include/linux/xattr.h
include/linux/xfrm.h [deleted file]
include/uapi/linux/Kbuild
include/uapi/linux/a.out.h [new file with mode: 0644]
include/uapi/linux/acct.h [new file with mode: 0644]
include/uapi/linux/adb.h [new file with mode: 0644]
include/uapi/linux/adfs_fs.h [new file with mode: 0644]
include/uapi/linux/affs_hardblocks.h [new file with mode: 0644]
include/uapi/linux/agpgart.h [new file with mode: 0644]
include/uapi/linux/aio_abi.h [new file with mode: 0644]
include/uapi/linux/apm_bios.h [new file with mode: 0644]
include/uapi/linux/arcfb.h [new file with mode: 0644]
include/uapi/linux/atalk.h [new file with mode: 0644]
include/uapi/linux/atm.h [new file with mode: 0644]
include/uapi/linux/atm_eni.h [new file with mode: 0644]
include/uapi/linux/atm_he.h [new file with mode: 0644]
include/uapi/linux/atm_idt77105.h [new file with mode: 0644]
include/uapi/linux/atm_nicstar.h [new file with mode: 0644]
include/uapi/linux/atm_tcp.h [new file with mode: 0644]
include/uapi/linux/atm_zatm.h [new file with mode: 0644]
include/uapi/linux/atmapi.h [new file with mode: 0644]
include/uapi/linux/atmarp.h [new file with mode: 0644]
include/uapi/linux/atmbr2684.h [new file with mode: 0644]
include/uapi/linux/atmclip.h [new file with mode: 0644]
include/uapi/linux/atmdev.h [new file with mode: 0644]
include/uapi/linux/atmioc.h [new file with mode: 0644]
include/uapi/linux/atmlec.h [new file with mode: 0644]
include/uapi/linux/atmmpc.h [new file with mode: 0644]
include/uapi/linux/atmppp.h [new file with mode: 0644]
include/uapi/linux/atmsap.h [new file with mode: 0644]
include/uapi/linux/atmsvc.h [new file with mode: 0644]
include/uapi/linux/audit.h [new file with mode: 0644]
include/uapi/linux/auto_fs.h [new file with mode: 0644]
include/uapi/linux/auto_fs4.h [new file with mode: 0644]
include/uapi/linux/auxvec.h [new file with mode: 0644]
include/uapi/linux/ax25.h [new file with mode: 0644]
include/uapi/linux/b1lli.h [new file with mode: 0644]
include/uapi/linux/baycom.h [new file with mode: 0644]
include/uapi/linux/bfs_fs.h [new file with mode: 0644]
include/uapi/linux/binfmts.h [new file with mode: 0644]
include/uapi/linux/blkpg.h [new file with mode: 0644]
include/uapi/linux/blktrace_api.h [new file with mode: 0644]
include/uapi/linux/bpqether.h [new file with mode: 0644]
include/uapi/linux/bsg.h [new file with mode: 0644]
include/uapi/linux/byteorder/Kbuild
include/uapi/linux/byteorder/big_endian.h [new file with mode: 0644]
include/uapi/linux/byteorder/little_endian.h [new file with mode: 0644]
include/uapi/linux/can.h [new file with mode: 0644]
include/uapi/linux/capability.h [new file with mode: 0644]
include/uapi/linux/capi.h [new file with mode: 0644]
include/uapi/linux/cciss_defs.h [new file with mode: 0644]
include/uapi/linux/cciss_ioctl.h [new file with mode: 0644]
include/uapi/linux/cdrom.h [new file with mode: 0644]
include/uapi/linux/cgroupstats.h [new file with mode: 0644]
include/uapi/linux/chio.h [new file with mode: 0644]
include/uapi/linux/cm4000_cs.h [new file with mode: 0644]
include/uapi/linux/cn_proc.h [new file with mode: 0644]
include/uapi/linux/coda.h [new file with mode: 0644]
include/uapi/linux/coda_psdev.h [new file with mode: 0644]
include/uapi/linux/coff.h [new file with mode: 0644]
include/uapi/linux/connector.h [new file with mode: 0644]
include/uapi/linux/const.h [new file with mode: 0644]
include/uapi/linux/cramfs_fs.h [new file with mode: 0644]
include/uapi/linux/cuda.h [new file with mode: 0644]
include/uapi/linux/cyclades.h [new file with mode: 0644]
include/uapi/linux/cycx_cfm.h [new file with mode: 0644]
include/uapi/linux/dcbnl.h [new file with mode: 0644]
include/uapi/linux/dccp.h [new file with mode: 0644]
include/uapi/linux/dlm.h [new file with mode: 0644]
include/uapi/linux/dlm_device.h [new file with mode: 0644]
include/uapi/linux/dlm_netlink.h [new file with mode: 0644]
include/uapi/linux/dlm_plock.h [new file with mode: 0644]
include/uapi/linux/dlmconstants.h [new file with mode: 0644]
include/uapi/linux/dm-ioctl.h [new file with mode: 0644]
include/uapi/linux/dm-log-userspace.h [new file with mode: 0644]
include/uapi/linux/dn.h [new file with mode: 0644]
include/uapi/linux/dqblk_xfs.h [new file with mode: 0644]
include/uapi/linux/edd.h [new file with mode: 0644]
include/uapi/linux/efs_fs_sb.h [new file with mode: 0644]
include/uapi/linux/elf-em.h [new file with mode: 0644]
include/uapi/linux/elf-fdpic.h [new file with mode: 0644]
include/uapi/linux/elf.h [new file with mode: 0644]
include/uapi/linux/elfcore.h [new file with mode: 0644]
include/uapi/linux/errno.h [new file with mode: 0644]
include/uapi/linux/errqueue.h [new file with mode: 0644]
include/uapi/linux/ethtool.h [new file with mode: 0644]
include/uapi/linux/eventpoll.h [new file with mode: 0644]
include/uapi/linux/fadvise.h [new file with mode: 0644]
include/uapi/linux/falloc.h [new file with mode: 0644]
include/uapi/linux/fanotify.h [new file with mode: 0644]
include/uapi/linux/fb.h [new file with mode: 0644]
include/uapi/linux/fcntl.h [new file with mode: 0644]
include/uapi/linux/fd.h [new file with mode: 0644]
include/uapi/linux/fdreg.h [new file with mode: 0644]
include/uapi/linux/fib_rules.h [new file with mode: 0644]
include/uapi/linux/fiemap.h [new file with mode: 0644]
include/uapi/linux/filter.h [new file with mode: 0644]
include/uapi/linux/firewire-cdev.h [new file with mode: 0644]
include/uapi/linux/firewire-constants.h [new file with mode: 0644]
include/uapi/linux/flat.h [new file with mode: 0644]
include/uapi/linux/fs.h [new file with mode: 0644]
include/uapi/linux/fsl_hypervisor.h [new file with mode: 0644]
include/uapi/linux/fuse.h [new file with mode: 0644]
include/uapi/linux/futex.h [new file with mode: 0644]
include/uapi/linux/gameport.h [new file with mode: 0644]
include/uapi/linux/gen_stats.h [new file with mode: 0644]
include/uapi/linux/genetlink.h [new file with mode: 0644]
include/uapi/linux/gfs2_ondisk.h [new file with mode: 0644]
include/uapi/linux/gigaset_dev.h [new file with mode: 0644]
include/uapi/linux/hdlc.h [new file with mode: 0644]
include/uapi/linux/hdlcdrv.h [new file with mode: 0644]
include/uapi/linux/hdreg.h [new file with mode: 0644]
include/uapi/linux/hid.h [new file with mode: 0644]
include/uapi/linux/hiddev.h [new file with mode: 0644]
include/uapi/linux/hidraw.h [new file with mode: 0644]
include/uapi/linux/hpet.h [new file with mode: 0644]
include/uapi/linux/hysdn_if.h [new file with mode: 0644]
include/uapi/linux/i2c-dev.h [new file with mode: 0644]
include/uapi/linux/i2c.h [new file with mode: 0644]
include/uapi/linux/i2o-dev.h [new file with mode: 0644]
include/uapi/linux/i8k.h [new file with mode: 0644]
include/uapi/linux/icmp.h [new file with mode: 0644]
include/uapi/linux/icmpv6.h [new file with mode: 0644]
include/uapi/linux/if.h [new file with mode: 0644]
include/uapi/linux/if_addr.h [new file with mode: 0644]
include/uapi/linux/if_addrlabel.h [new file with mode: 0644]
include/uapi/linux/if_alg.h [new file with mode: 0644]
include/uapi/linux/if_arcnet.h [new file with mode: 0644]
include/uapi/linux/if_arp.h [new file with mode: 0644]
include/uapi/linux/if_bonding.h [new file with mode: 0644]
include/uapi/linux/if_bridge.h [new file with mode: 0644]
include/uapi/linux/if_cablemodem.h [new file with mode: 0644]
include/uapi/linux/if_eql.h [new file with mode: 0644]
include/uapi/linux/if_ether.h [new file with mode: 0644]
include/uapi/linux/if_fc.h [new file with mode: 0644]
include/uapi/linux/if_fddi.h [new file with mode: 0644]
include/uapi/linux/if_frad.h [new file with mode: 0644]
include/uapi/linux/if_hippi.h [new file with mode: 0644]
include/uapi/linux/if_infiniband.h [new file with mode: 0644]
include/uapi/linux/if_link.h [new file with mode: 0644]
include/uapi/linux/if_ltalk.h [new file with mode: 0644]
include/uapi/linux/if_packet.h [new file with mode: 0644]
include/uapi/linux/if_phonet.h [new file with mode: 0644]
include/uapi/linux/if_plip.h [new file with mode: 0644]
include/uapi/linux/if_ppp.h [new file with mode: 0644]
include/uapi/linux/if_pppol2tp.h [new file with mode: 0644]
include/uapi/linux/if_pppox.h [new file with mode: 0644]
include/uapi/linux/if_slip.h [new file with mode: 0644]
include/uapi/linux/if_team.h [new file with mode: 0644]
include/uapi/linux/if_tun.h [new file with mode: 0644]
include/uapi/linux/if_tunnel.h [new file with mode: 0644]
include/uapi/linux/if_vlan.h [new file with mode: 0644]
include/uapi/linux/if_x25.h [new file with mode: 0644]
include/uapi/linux/igmp.h [new file with mode: 0644]
include/uapi/linux/in.h [new file with mode: 0644]
include/uapi/linux/in6.h [new file with mode: 0644]
include/uapi/linux/in_route.h [new file with mode: 0644]
include/uapi/linux/inet_diag.h [new file with mode: 0644]
include/uapi/linux/inotify.h [new file with mode: 0644]
include/uapi/linux/input.h [new file with mode: 0644]
include/uapi/linux/ioctl.h [new file with mode: 0644]
include/uapi/linux/ip.h [new file with mode: 0644]
include/uapi/linux/ip6_tunnel.h [new file with mode: 0644]
include/uapi/linux/ip_vs.h [new file with mode: 0644]
include/uapi/linux/ipc.h [new file with mode: 0644]
include/uapi/linux/ipmi.h [new file with mode: 0644]
include/uapi/linux/ipmi_msgdefs.h [new file with mode: 0644]
include/uapi/linux/ipsec.h [new file with mode: 0644]
include/uapi/linux/ipv6.h [new file with mode: 0644]
include/uapi/linux/ipv6_route.h [new file with mode: 0644]
include/uapi/linux/ipx.h [new file with mode: 0644]
include/uapi/linux/irda.h [new file with mode: 0644]
include/uapi/linux/irqnr.h [new file with mode: 0644]
include/uapi/linux/isdn.h [new file with mode: 0644]
include/uapi/linux/isdn_divertif.h [new file with mode: 0644]
include/uapi/linux/isdn_ppp.h [new file with mode: 0644]
include/uapi/linux/isdnif.h [new file with mode: 0644]
include/uapi/linux/iso_fs.h [new file with mode: 0644]
include/uapi/linux/ivtv.h [new file with mode: 0644]
include/uapi/linux/ivtvfb.h [new file with mode: 0644]
include/uapi/linux/ixjuser.h [new file with mode: 0644]
include/uapi/linux/jffs2.h [new file with mode: 0644]
include/uapi/linux/joystick.h [new file with mode: 0644]
include/uapi/linux/kd.h [new file with mode: 0644]
include/uapi/linux/kdev_t.h [new file with mode: 0644]
include/uapi/linux/kernel-page-flags.h [new file with mode: 0644]
include/uapi/linux/kernel.h [new file with mode: 0644]
include/uapi/linux/kernelcapi.h [new file with mode: 0644]
include/uapi/linux/kexec.h [new file with mode: 0644]
include/uapi/linux/keyboard.h [new file with mode: 0644]
include/uapi/linux/keyctl.h [new file with mode: 0644]
include/uapi/linux/kvm.h [new file with mode: 0644]
include/uapi/linux/kvm_para.h [new file with mode: 0644]
include/uapi/linux/l2tp.h [new file with mode: 0644]
include/uapi/linux/limits.h [new file with mode: 0644]
include/uapi/linux/llc.h [new file with mode: 0644]
include/uapi/linux/loop.h [new file with mode: 0644]
include/uapi/linux/lp.h [new file with mode: 0644]
include/uapi/linux/magic.h [new file with mode: 0644]
include/uapi/linux/major.h [new file with mode: 0644]
include/uapi/linux/map_to_7segment.h [new file with mode: 0644]
include/uapi/linux/matroxfb.h [new file with mode: 0644]
include/uapi/linux/mdio.h [new file with mode: 0644]
include/uapi/linux/media.h [new file with mode: 0644]
include/uapi/linux/mei.h [new file with mode: 0644]
include/uapi/linux/mempolicy.h [new file with mode: 0644]
include/uapi/linux/meye.h [new file with mode: 0644]
include/uapi/linux/mii.h [new file with mode: 0644]
include/uapi/linux/minix_fs.h [new file with mode: 0644]
include/uapi/linux/mman.h [new file with mode: 0644]
include/uapi/linux/mmtimer.h [new file with mode: 0644]
include/uapi/linux/mqueue.h [new file with mode: 0644]
include/uapi/linux/mroute.h [new file with mode: 0644]
include/uapi/linux/mroute6.h [new file with mode: 0644]
include/uapi/linux/msdos_fs.h [new file with mode: 0644]
include/uapi/linux/msg.h [new file with mode: 0644]
include/uapi/linux/mtio.h [new file with mode: 0644]
include/uapi/linux/n_r3964.h [new file with mode: 0644]
include/uapi/linux/nbd.h [new file with mode: 0644]
include/uapi/linux/ncp.h [new file with mode: 0644]
include/uapi/linux/ncp_fs.h [new file with mode: 0644]
include/uapi/linux/ncp_mount.h [new file with mode: 0644]
include/uapi/linux/ncp_no.h [new file with mode: 0644]
include/uapi/linux/neighbour.h [new file with mode: 0644]
include/uapi/linux/net.h [new file with mode: 0644]
include/uapi/linux/net_dropmon.h [new file with mode: 0644]
include/uapi/linux/net_tstamp.h [new file with mode: 0644]
include/uapi/linux/netdevice.h [new file with mode: 0644]
include/uapi/linux/netfilter.h [new file with mode: 0644]
include/uapi/linux/netfilter_arp.h [new file with mode: 0644]
include/uapi/linux/netfilter_bridge.h [new file with mode: 0644]
include/uapi/linux/netfilter_decnet.h [new file with mode: 0644]
include/uapi/linux/netfilter_ipv4.h [new file with mode: 0644]
include/uapi/linux/netfilter_ipv6.h [new file with mode: 0644]
include/uapi/linux/netlink.h [new file with mode: 0644]
include/uapi/linux/netrom.h [new file with mode: 0644]
include/uapi/linux/nfc.h [new file with mode: 0644]
include/uapi/linux/nfs.h [new file with mode: 0644]
include/uapi/linux/nfs2.h [new file with mode: 0644]
include/uapi/linux/nfs3.h [new file with mode: 0644]
include/uapi/linux/nfs4.h [new file with mode: 0644]
include/uapi/linux/nfs4_mount.h [new file with mode: 0644]
include/uapi/linux/nfs_fs.h [new file with mode: 0644]
include/uapi/linux/nfs_idmap.h [new file with mode: 0644]
include/uapi/linux/nfs_mount.h [new file with mode: 0644]
include/uapi/linux/nfsacl.h [new file with mode: 0644]
include/uapi/linux/nl80211.h [new file with mode: 0644]
include/uapi/linux/nubus.h [new file with mode: 0644]
include/uapi/linux/nvram.h [new file with mode: 0644]
include/uapi/linux/omap3isp.h [new file with mode: 0644]
include/uapi/linux/omapfb.h [new file with mode: 0644]
include/uapi/linux/oom.h [new file with mode: 0644]
include/uapi/linux/packet_diag.h [new file with mode: 0644]
include/uapi/linux/param.h [new file with mode: 0644]
include/uapi/linux/parport.h [new file with mode: 0644]
include/uapi/linux/patchkey.h [new file with mode: 0644]
include/uapi/linux/pci.h [new file with mode: 0644]
include/uapi/linux/pci_regs.h [new file with mode: 0644]
include/uapi/linux/perf_event.h [new file with mode: 0644]
include/uapi/linux/personality.h [new file with mode: 0644]
include/uapi/linux/pfkeyv2.h [new file with mode: 0644]
include/uapi/linux/pg.h [new file with mode: 0644]
include/uapi/linux/phantom.h [new file with mode: 0644]
include/uapi/linux/phonet.h [new file with mode: 0644]
include/uapi/linux/pkt_cls.h [new file with mode: 0644]
include/uapi/linux/pkt_sched.h [new file with mode: 0644]
include/uapi/linux/pktcdvd.h [new file with mode: 0644]
include/uapi/linux/pmu.h [new file with mode: 0644]
include/uapi/linux/poll.h [new file with mode: 0644]
include/uapi/linux/posix_types.h [new file with mode: 0644]
include/uapi/linux/ppdev.h [new file with mode: 0644]
include/uapi/linux/ppp-comp.h [new file with mode: 0644]
include/uapi/linux/ppp-ioctl.h [new file with mode: 0644]
include/uapi/linux/ppp_defs.h [new file with mode: 0644]
include/uapi/linux/pps.h [new file with mode: 0644]
include/uapi/linux/prctl.h [new file with mode: 0644]
include/uapi/linux/ptp_clock.h [new file with mode: 0644]
include/uapi/linux/ptrace.h [new file with mode: 0644]
include/uapi/linux/qnx4_fs.h [new file with mode: 0644]
include/uapi/linux/qnxtypes.h [new file with mode: 0644]
include/uapi/linux/quota.h [new file with mode: 0644]
include/uapi/linux/radeonfb.h [new file with mode: 0644]
include/uapi/linux/random.h [new file with mode: 0644]
include/uapi/linux/raw.h [new file with mode: 0644]
include/uapi/linux/rds.h [new file with mode: 0644]
include/uapi/linux/reboot.h [new file with mode: 0644]
include/uapi/linux/reiserfs_fs.h [new file with mode: 0644]
include/uapi/linux/reiserfs_xattr.h [new file with mode: 0644]
include/uapi/linux/resource.h [new file with mode: 0644]
include/uapi/linux/rfkill.h [new file with mode: 0644]
include/uapi/linux/romfs_fs.h [new file with mode: 0644]
include/uapi/linux/rose.h [new file with mode: 0644]
include/uapi/linux/route.h [new file with mode: 0644]
include/uapi/linux/rtc.h [new file with mode: 0644]
include/uapi/linux/rtnetlink.h [new file with mode: 0644]
include/uapi/linux/scc.h [new file with mode: 0644]
include/uapi/linux/sched.h [new file with mode: 0644]
include/uapi/linux/screen_info.h [new file with mode: 0644]
include/uapi/linux/sdla.h [new file with mode: 0644]
include/uapi/linux/seccomp.h [new file with mode: 0644]
include/uapi/linux/securebits.h [new file with mode: 0644]
include/uapi/linux/selinux_netlink.h [new file with mode: 0644]
include/uapi/linux/sem.h [new file with mode: 0644]
include/uapi/linux/serial.h [new file with mode: 0644]
include/uapi/linux/serial_core.h [new file with mode: 0644]
include/uapi/linux/serial_reg.h [new file with mode: 0644]
include/uapi/linux/serio.h [new file with mode: 0644]
include/uapi/linux/shm.h [new file with mode: 0644]
include/uapi/linux/signal.h [new file with mode: 0644]
include/uapi/linux/signalfd.h [new file with mode: 0644]
include/uapi/linux/snmp.h [new file with mode: 0644]
include/uapi/linux/sock_diag.h [new file with mode: 0644]
include/uapi/linux/socket.h [new file with mode: 0644]
include/uapi/linux/sockios.h [new file with mode: 0644]
include/uapi/linux/som.h [new file with mode: 0644]
include/uapi/linux/sonet.h [new file with mode: 0644]
include/uapi/linux/sonypi.h [new file with mode: 0644]
include/uapi/linux/sound.h [new file with mode: 0644]
include/uapi/linux/soundcard.h [new file with mode: 0644]
include/uapi/linux/stat.h [new file with mode: 0644]
include/uapi/linux/stddef.h [new file with mode: 0644]
include/uapi/linux/string.h [new file with mode: 0644]
include/uapi/linux/suspend_ioctls.h [new file with mode: 0644]
include/uapi/linux/swab.h [new file with mode: 0644]
include/uapi/linux/synclink.h [new file with mode: 0644]
include/uapi/linux/sysctl.h [new file with mode: 0644]
include/uapi/linux/sysinfo.h [new file with mode: 0644]
include/uapi/linux/taskstats.h [new file with mode: 0644]
include/uapi/linux/tcp.h [new file with mode: 0644]
include/uapi/linux/tcp_metrics.h [new file with mode: 0644]
include/uapi/linux/telephony.h [new file with mode: 0644]
include/uapi/linux/termios.h [new file with mode: 0644]
include/uapi/linux/time.h [new file with mode: 0644]
include/uapi/linux/times.h [new file with mode: 0644]
include/uapi/linux/timex.h [new file with mode: 0644]
include/uapi/linux/tiocl.h [new file with mode: 0644]
include/uapi/linux/tipc.h [new file with mode: 0644]
include/uapi/linux/tipc_config.h [new file with mode: 0644]
include/uapi/linux/toshiba.h [new file with mode: 0644]
include/uapi/linux/tty.h [new file with mode: 0644]
include/uapi/linux/tty_flags.h [new file with mode: 0644]
include/uapi/linux/types.h [new file with mode: 0644]
include/uapi/linux/udf_fs_i.h [new file with mode: 0644]
include/uapi/linux/udp.h [new file with mode: 0644]
include/uapi/linux/uhid.h [new file with mode: 0644]
include/uapi/linux/uinput.h [new file with mode: 0644]
include/uapi/linux/uio.h [new file with mode: 0644]
include/uapi/linux/ultrasound.h [new file with mode: 0644]
include/uapi/linux/un.h [new file with mode: 0644]
include/uapi/linux/unistd.h [new file with mode: 0644]
include/uapi/linux/unix_diag.h [new file with mode: 0644]
include/uapi/linux/usbdevice_fs.h [new file with mode: 0644]
include/uapi/linux/utime.h [new file with mode: 0644]
include/uapi/linux/utsname.h [new file with mode: 0644]
include/uapi/linux/uuid.h [new file with mode: 0644]
include/uapi/linux/uvcvideo.h [new file with mode: 0644]
include/uapi/linux/v4l2-common.h [new file with mode: 0644]
include/uapi/linux/v4l2-controls.h [new file with mode: 0644]
include/uapi/linux/v4l2-dv-timings.h [new file with mode: 0644]
include/uapi/linux/v4l2-mediabus.h [new file with mode: 0644]
include/uapi/linux/v4l2-subdev.h [new file with mode: 0644]
include/uapi/linux/veth.h [new file with mode: 0644]
include/uapi/linux/vfio.h [new file with mode: 0644]
include/uapi/linux/vhost.h [new file with mode: 0644]
include/uapi/linux/videodev2.h [new file with mode: 0644]
include/uapi/linux/virtio_9p.h [new file with mode: 0644]
include/uapi/linux/virtio_balloon.h [new file with mode: 0644]
include/uapi/linux/virtio_blk.h [new file with mode: 0644]
include/uapi/linux/virtio_config.h [new file with mode: 0644]
include/uapi/linux/virtio_console.h [new file with mode: 0644]
include/uapi/linux/virtio_ids.h [new file with mode: 0644]
include/uapi/linux/virtio_net.h [new file with mode: 0644]
include/uapi/linux/virtio_pci.h [new file with mode: 0644]
include/uapi/linux/virtio_ring.h [new file with mode: 0644]
include/uapi/linux/virtio_rng.h [new file with mode: 0644]
include/uapi/linux/vt.h [new file with mode: 0644]
include/uapi/linux/wait.h [new file with mode: 0644]
include/uapi/linux/wanrouter.h [new file with mode: 0644]
include/uapi/linux/watchdog.h [new file with mode: 0644]
include/uapi/linux/wimax.h [new file with mode: 0644]
include/uapi/linux/wireless.h [new file with mode: 0644]
include/uapi/linux/x25.h [new file with mode: 0644]
include/uapi/linux/xattr.h [new file with mode: 0644]
include/uapi/linux/xfrm.h [new file with mode: 0644]
tools/vm/page-types.c

index d114db9477f43468b85a692e034f00d18ec2d596..5b57367e28db9b848de3e54c32830faa62793924 100644 (file)
@@ -22,390 +22,10 @@ header-y += wimax/
 
 ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
                  $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),)
-header-y += a.out.h
 endif
 ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
                  $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h),)
-header-y += kvm.h
 endif
 ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
                  $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h),)
-header-y += kvm_para.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 += apm_bios.h
-header-y += arcfb.h
-header-y += atalk.h
-header-y += atm.h
-header-y += atm_eni.h
-header-y += atm_he.h
-header-y += atm_idt77105.h
-header-y += atm_nicstar.h
-header-y += atm_tcp.h
-header-y += atm_zatm.h
-header-y += atmapi.h
-header-y += atmarp.h
-header-y += atmbr2684.h
-header-y += atmclip.h
-header-y += atmdev.h
-header-y += atmioc.h
-header-y += atmlec.h
-header-y += atmmpc.h
-header-y += atmppp.h
-header-y += atmsap.h
-header-y += atmsvc.h
-header-y += audit.h
-header-y += auto_fs.h
-header-y += auto_fs4.h
-header-y += auxvec.h
-header-y += ax25.h
-header-y += b1lli.h
-header-y += baycom.h
-header-y += bfs_fs.h
-header-y += binfmts.h
-header-y += blk_types.h
-header-y += blkpg.h
-header-y += blktrace_api.h
-header-y += bpqether.h
-header-y += bsg.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 += 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 += dlm.h
-header-y += dlm_device.h
-header-y += dlm_netlink.h
-header-y += dlm_plock.h
-header-y += dlmconstants.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 += elf-em.h
-header-y += elf-fdpic.h
-header-y += elf.h
-header-y += elfcore.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 += fs.h
-header-y += fsl_hypervisor.h
-header-y += fuse.h
-header-y += futex.h
-header-y += gameport.h
-header-y += gen_stats.h
-header-y += genetlink.h
-header-y += gfs2_ondisk.h
-header-y += gigaset_dev.h
-header-y += hdlc.h
-header-y += hdlcdrv.h
-header-y += hdreg.h
-header-y += hid.h
-header-y += hiddev.h
-header-y += hidraw.h
-header-y += hpet.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.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_hippi.h
-header-y += if_infiniband.h
-header-y += if_link.h
-header-y += if_ltalk.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 += in.h
-header-y += in6.h
-header-y += in_route.h
-header-y += sock_diag.h
-header-y += inet_diag.h
-header-y += unix_diag.h
-header-y += packet_diag.h
-header-y += inotify.h
-header-y += input.h
-header-y += ioctl.h
-header-y += ip.h
-header-y += ip6_tunnel.h
-header-y += ip_vs.h
-header-y += ipc.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 += ipx.h
-header-y += irda.h
-header-y += irqnr.h
-header-y += isdn.h
-header-y += isdn_divertif.h
-header-y += isdn_ppp.h
-header-y += isdnif.h
-header-y += iso_fs.h
-header-y += ivtv.h
-header-y += ivtvfb.h
-header-y += ixjuser.h
-header-y += jffs2.h
-header-y += joystick.h
-header-y += kd.h
-header-y += kdev_t.h
-header-y += kernel.h
-header-y += kernelcapi.h
-header-y += kernel-page-flags.h
-header-y += kexec.h
-header-y += keyboard.h
-header-y += keyctl.h
-header-y += l2tp.h
-header-y += limits.h
-header-y += llc.h
-header-y += loop.h
-header-y += lp.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 += mei.h
-header-y += mempolicy.h
-header-y += meye.h
-header-y += mii.h
-header-y += minix_fs.h
-header-y += mman.h
-header-y += mmtimer.h
-header-y += mqueue.h
-header-y += mroute.h
-header-y += mroute6.h
-header-y += msdos_fs.h
-header-y += msg.h
-header-y += mtio.h
-header-y += n_r3964.h
-header-y += nbd.h
-header-y += ncp.h
-header-y += ncp_fs.h
-header-y += ncp_mount.h
-header-y += ncp_no.h
-header-y += neighbour.h
-header-y += net.h
-header-y += net_dropmon.h
-header-y += net_tstamp.h
-header-y += netdevice.h
-header-y += netfilter.h
-header-y += netfilter_arp.h
-header-y += netfilter_bridge.h
-header-y += netfilter_decnet.h
-header-y += netfilter_ipv4.h
-header-y += netfilter_ipv6.h
-header-y += netlink.h
-header-y += netrom.h
-header-y += nfc.h
-header-y += nfs.h
-header-y += nfs2.h
-header-y += nfs3.h
-header-y += nfs4.h
-header-y += nfs4_mount.h
-header-y += nfs_fs.h
-header-y += nfs_idmap.h
-header-y += nfs_mount.h
-header-y += nfsacl.h
-header-y += nl80211.h
-header-y += nubus.h
-header-y += nvram.h
-header-y += omap3isp.h
-header-y += omapfb.h
-header-y += oom.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 += pkt_cls.h
-header-y += pkt_sched.h
-header-y += pktcdvd.h
-header-y += pmu.h
-header-y += poll.h
-header-y += posix_types.h
-header-y += ppdev.h
-header-y += ppp-comp.h
-header-y += ppp-ioctl.h
-header-y += ppp_defs.h
-header-y += pps.h
-header-y += prctl.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 += 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 += screen_info.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.h
-header-y += serial_core.h
-header-y += serial_reg.h
-header-y += serio.h
-header-y += shm.h
-header-y += signal.h
-header-y += signalfd.h
-header-y += snmp.h
-header-y += socket.h
-header-y += sockios.h
-header-y += som.h
-header-y += sonet.h
-header-y += sonypi.h
-header-y += sound.h
-header-y += soundcard.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 += sysctl.h
-header-y += sysinfo.h
-header-y += taskstats.h
-header-y += tcp.h
-header-y += tcp_metrics.h
-header-y += telephony.h
-header-y += termios.h
-header-y += time.h
-header-y += times.h
-header-y += timex.h
-header-y += tiocl.h
-header-y += tipc.h
-header-y += tipc_config.h
-header-y += toshiba.h
-header-y += tty.h
-header-y += tty_flags.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 += ultrasound.h
-header-y += un.h
-header-y += unistd.h
-header-y += usbdevice_fs.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_ids.h
-header-y += virtio_net.h
-header-y += virtio_pci.h
-header-y += virtio_ring.h
-header-y += virtio_rng.h
-header-y += vt.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
index e86dfca44589f49e083e53a3f905868ba2e89955..220f1433889566f681c738b3c7a9bd3e23f62db5 100644 (file)
 #ifndef __A_OUT_GNU_H__
 #define __A_OUT_GNU_H__
 
-#define __GNU_EXEC_MACROS__
-
-#ifndef __STRUCT_EXEC_OVERRIDE__
-
-#include <asm/a.out.h>
-
-#endif /* __STRUCT_EXEC_OVERRIDE__ */
+#include <uapi/linux/a.out.h>
 
 #ifndef __ASSEMBLY__
-
-/* these go in the N_MACHTYPE field */
-enum machine_type {
 #if defined (M_OLDSUN2)
-  M__OLDSUN2 = M_OLDSUN2,
 #else
-  M_OLDSUN2 = 0,
 #endif
 #if defined (M_68010)
-  M__68010 = M_68010,
 #else
-  M_68010 = 1,
 #endif
 #if defined (M_68020)
-  M__68020 = M_68020,
 #else
-  M_68020 = 2,
 #endif
 #if defined (M_SPARC)
-  M__SPARC = M_SPARC,
 #else
-  M_SPARC = 3,
 #endif
-  /* skip a bunch so we don't run into any of sun's numbers */
-  M_386 = 100,
-  M_MIPS1 = 151,       /* MIPS R3000/R3000 binary */
-  M_MIPS2 = 152                /* MIPS R6000/R4000 binary */
-};
-
 #if !defined (N_MAGIC)
-#define N_MAGIC(exec) ((exec).a_info & 0xffff)
 #endif
-#define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff))
-#define N_FLAGS(exec) (((exec).a_info >> 24) & 0xff)
-#define N_SET_INFO(exec, magic, type, flags) \
-       ((exec).a_info = ((magic) & 0xffff) \
-        | (((int)(type) & 0xff) << 16) \
-        | (((flags) & 0xff) << 24))
-#define N_SET_MAGIC(exec, magic) \
-       ((exec).a_info = (((exec).a_info & 0xffff0000) | ((magic) & 0xffff)))
-
-#define N_SET_MACHTYPE(exec, machtype) \
-       ((exec).a_info = \
-        ((exec).a_info&0xff00ffff) | ((((int)(machtype))&0xff) << 16))
-
-#define N_SET_FLAGS(exec, flags) \
-       ((exec).a_info = \
-        ((exec).a_info&0x00ffffff) | (((flags) & 0xff) << 24))
-
-/* Code indicating object file or impure executable.  */
-#define OMAGIC 0407
-/* Code indicating pure executable.  */
-#define NMAGIC 0410
-/* Code indicating demand-paged executable.  */
-#define ZMAGIC 0413
-/* This indicates a demand-paged executable with the header in the text. 
-   The first page is unmapped to help trap NULL pointer references */
-#define QMAGIC 0314
-
-/* Code indicating core file.  */
-#define CMAGIC 0421
-
 #if !defined (N_BADMAG)
-#define N_BADMAG(x)      (N_MAGIC(x) != OMAGIC         \
-                       && N_MAGIC(x) != NMAGIC         \
-                       && N_MAGIC(x) != ZMAGIC \
-                       && N_MAGIC(x) != QMAGIC)
 #endif
-
-#define _N_HDROFF(x) (1024 - sizeof (struct exec))
-
 #if !defined (N_TXTOFF)
-#define N_TXTOFF(x) \
- (N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec) : \
-  (N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec)))
 #endif
-
 #if !defined (N_DATOFF)
-#define N_DATOFF(x) (N_TXTOFF(x) + (x).a_text)
 #endif
-
 #if !defined (N_TRELOFF)
-#define N_TRELOFF(x) (N_DATOFF(x) + (x).a_data)
 #endif
-
 #if !defined (N_DRELOFF)
-#define N_DRELOFF(x) (N_TRELOFF(x) + N_TRSIZE(x))
 #endif
-
 #if !defined (N_SYMOFF)
-#define N_SYMOFF(x) (N_DRELOFF(x) + N_DRSIZE(x))
 #endif
-
 #if !defined (N_STROFF)
-#define N_STROFF(x) (N_SYMOFF(x) + N_SYMSIZE(x))
 #endif
-
-/* Address of text segment in memory after it is loaded.  */
 #if !defined (N_TXTADDR)
-#define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? PAGE_SIZE : 0)
 #endif
-
-/* Address of data segment in memory after it is loaded.
-   Note that it is up to you to define SEGMENT_SIZE
-   on machines not listed here.  */
 #if defined(vax) || defined(hp300) || defined(pyr)
-#define SEGMENT_SIZE page_size
 #endif
 #ifdef sony
-#define        SEGMENT_SIZE    0x2000
 #endif /* Sony.  */
 #ifdef is68k
-#define SEGMENT_SIZE 0x20000
 #endif
 #if defined(m68k) && defined(PORTAR)
-#define PAGE_SIZE 0x400
-#define SEGMENT_SIZE PAGE_SIZE
 #endif
-
 #ifdef linux
-#ifdef __KERNEL__
 #include <asm/page.h>
-#else
-#include <unistd.h>
-#endif
 #if defined(__i386__) || defined(__mc68000__)
-#define SEGMENT_SIZE   1024
 #else
 #ifndef SEGMENT_SIZE
-#ifdef __KERNEL__
 #define SEGMENT_SIZE   PAGE_SIZE
-#else
-#define SEGMENT_SIZE   getpagesize()
-#endif
 #endif
 #endif
 #endif
-
-#define _N_SEGMENT_ROUND(x) ALIGN(x, SEGMENT_SIZE)
-
-#define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text)
-
 #ifndef N_DATADDR
-#define N_DATADDR(x) \
-    (N_MAGIC(x)==OMAGIC? (_N_TXTENDADDR(x)) \
-     : (_N_SEGMENT_ROUND (_N_TXTENDADDR(x))))
 #endif
-
-/* Address of bss segment in memory after it is loaded.  */
 #if !defined (N_BSSADDR)
-#define N_BSSADDR(x) (N_DATADDR(x) + (x).a_data)
 #endif
-\f
 #if !defined (N_NLIST_DECLARED)
-struct nlist {
-  union {
-    char *n_name;
-    struct nlist *n_next;
-    long n_strx;
-  } n_un;
-  unsigned char n_type;
-  char n_other;
-  short n_desc;
-  unsigned long n_value;
-};
 #endif /* no N_NLIST_DECLARED.  */
-
 #if !defined (N_UNDF)
-#define N_UNDF 0
 #endif
 #if !defined (N_ABS)
-#define N_ABS 2
 #endif
 #if !defined (N_TEXT)
-#define N_TEXT 4
 #endif
 #if !defined (N_DATA)
-#define N_DATA 6
 #endif
 #if !defined (N_BSS)
-#define N_BSS 8
 #endif
 #if !defined (N_FN)
-#define N_FN 15
 #endif
-
 #if !defined (N_EXT)
-#define N_EXT 1
 #endif
 #if !defined (N_TYPE)
-#define N_TYPE 036
 #endif
 #if !defined (N_STAB)
-#define N_STAB 0340
 #endif
-
-/* The following type indicates the definition of a symbol as being
-   an indirect reference to another symbol.  The other symbol
-   appears as an undefined reference, immediately following this symbol.
-
-   Indirection is asymmetrical.  The other symbol's value will be used
-   to satisfy requests for the indirect symbol, but not vice versa.
-   If the other symbol does not have a definition, libraries will
-   be searched to find a definition.  */
-#define N_INDR 0xa
-
-/* The following symbols refer to set elements.
-   All the N_SET[ATDB] symbols with the same name form one set.
-   Space is allocated for the set in the text section, and each set
-   element's value is stored into one word of the space.
-   The first word of the space is the length of the set (number of elements).
-
-   The address of the set is made into an N_SETV symbol
-   whose name is the same as the name of the set.
-   This symbol acts like a N_DATA global symbol
-   in that it can satisfy undefined external references.  */
-
-/* These appear as input to LD, in a .o file.  */
-#define        N_SETA  0x14            /* Absolute set element symbol */
-#define        N_SETT  0x16            /* Text set element symbol */
-#define        N_SETD  0x18            /* Data set element symbol */
-#define        N_SETB  0x1A            /* Bss set element symbol */
-
-/* This is output from LD.  */
-#define N_SETV 0x1C            /* Pointer to set vector in data area.  */
-\f
 #if !defined (N_RELOCATION_INFO_DECLARED)
-/* This structure describes a single relocation to be performed.
-   The text-relocation section of the file is a vector of these structures,
-   all of which apply to the text section.
-   Likewise, the data-relocation section applies to the data section.  */
-
-struct relocation_info
-{
-  /* Address (within segment) to be relocated.  */
-  int r_address;
-  /* The meaning of r_symbolnum depends on r_extern.  */
-  unsigned int r_symbolnum:24;
-  /* Nonzero means value is a pc-relative offset
-     and it should be relocated for changes in its own address
-     as well as for changes in the symbol or section specified.  */
-  unsigned int r_pcrel:1;
-  /* Length (as exponent of 2) of the field to be relocated.
-     Thus, a value of 2 indicates 1<<2 bytes.  */
-  unsigned int r_length:2;
-  /* 1 => relocate with value of symbol.
-          r_symbolnum is the index of the symbol
-         in file's the symbol table.
-     0 => relocate with the address of a segment.
-          r_symbolnum is N_TEXT, N_DATA, N_BSS or N_ABS
-         (the N_EXT bit may be set also, but signifies nothing).  */
-  unsigned int r_extern:1;
-  /* Four bits that aren't used, but when writing an object file
-     it is desirable to clear them.  */
 #ifdef NS32K
-  unsigned r_bsr:1;
-  unsigned r_disp:1;
-  unsigned r_pad:2;
 #else
-  unsigned int r_pad:4;
 #endif
-};
 #endif /* no N_RELOCATION_INFO_DECLARED.  */
-
 #endif /*__ASSEMBLY__ */
 #endif /* __A_OUT_GNU_H__ */
index d537aa0ec414a2dc70b84580a0799096e601ee3c..4a5b7cb56079121152b780d7a75e54f43de4f344 100644 (file)
  *  Copyright (C) 1995 - 1997 Marco van Wieringen - ELM Consultancy B.V.
  *
  */
-
 #ifndef _LINUX_ACCT_H
 #define _LINUX_ACCT_H
 
-#include <linux/types.h>
-
-#include <asm/param.h>
-#include <asm/byteorder.h>
-
-/* 
- *  comp_t is a 16-bit "floating" point number with a 3-bit base 8
- *  exponent and a 13-bit fraction.
- *  comp2_t is 24-bit with 5-bit base 2 exponent and 20 bit fraction
- *  (leading 1 not stored).
- *  See linux/kernel/acct.c for the specific encoding systems used.
- */
-
-typedef __u16  comp_t;
-typedef __u32  comp2_t;
-
-/*
- *   accounting file record
- *
- *   This structure contains all of the information written out to the
- *   process accounting file whenever a process exits.
- */
+#include <uapi/linux/acct.h>
 
-#define ACCT_COMM      16
-
-struct acct
-{
-       char            ac_flag;                /* Flags */
-       char            ac_version;             /* Always set to ACCT_VERSION */
-       /* for binary compatibility back until 2.0 */
-       __u16           ac_uid16;               /* LSB of Real User ID */
-       __u16           ac_gid16;               /* LSB of Real Group ID */
-       __u16           ac_tty;                 /* Control Terminal */
-       __u32           ac_btime;               /* Process Creation Time */
-       comp_t          ac_utime;               /* User Time */
-       comp_t          ac_stime;               /* System Time */
-       comp_t          ac_etime;               /* Elapsed Time */
-       comp_t          ac_mem;                 /* Average Memory Usage */
-       comp_t          ac_io;                  /* Chars Transferred */
-       comp_t          ac_rw;                  /* Blocks Read or Written */
-       comp_t          ac_minflt;              /* Minor Pagefaults */
-       comp_t          ac_majflt;              /* Major Pagefaults */
-       comp_t          ac_swaps;               /* Number of Swaps */
-/* m68k had no padding here. */
-#if !defined(CONFIG_M68K) || !defined(__KERNEL__)
-       __u16           ac_ahz;                 /* AHZ */
-#endif
-       __u32           ac_exitcode;            /* Exitcode */
-       char            ac_comm[ACCT_COMM + 1]; /* Command Name */
-       __u8            ac_etime_hi;            /* Elapsed Time MSB */
-       __u16           ac_etime_lo;            /* Elapsed Time LSB */
-       __u32           ac_uid;                 /* Real User ID */
-       __u32           ac_gid;                 /* Real Group ID */
-};
-
-struct acct_v3
-{
-       char            ac_flag;                /* Flags */
-       char            ac_version;             /* Always set to ACCT_VERSION */
-       __u16           ac_tty;                 /* Control Terminal */
-       __u32           ac_exitcode;            /* Exitcode */
-       __u32           ac_uid;                 /* Real User ID */
-       __u32           ac_gid;                 /* Real Group ID */
-       __u32           ac_pid;                 /* Process ID */
-       __u32           ac_ppid;                /* Parent Process ID */
-       __u32           ac_btime;               /* Process Creation Time */
-#ifdef __KERNEL__
-       __u32           ac_etime;               /* Elapsed Time */
-#else
-       float           ac_etime;               /* Elapsed Time */
-#endif
-       comp_t          ac_utime;               /* User Time */
-       comp_t          ac_stime;               /* System Time */
-       comp_t          ac_mem;                 /* Average Memory Usage */
-       comp_t          ac_io;                  /* Chars Transferred */
-       comp_t          ac_rw;                  /* Blocks Read or Written */
-       comp_t          ac_minflt;              /* Minor Pagefaults */
-       comp_t          ac_majflt;              /* Major Pagefaults */
-       comp_t          ac_swaps;               /* Number of Swaps */
-       char            ac_comm[ACCT_COMM];     /* Command Name */
-};
-
-/*
- *  accounting flags
- */
-                               /* bit set when the process ... */
-#define AFORK          0x01    /* ... executed fork, but did not exec */
-#define ASU            0x02    /* ... used super-user privileges */
-#define ACOMPAT                0x04    /* ... used compatibility mode (VAX only not used) */
-#define ACORE          0x08    /* ... dumped core */
-#define AXSIG          0x10    /* ... was killed by a signal */
-
-#ifdef __BIG_ENDIAN
-#define ACCT_BYTEORDER 0x80    /* accounting file is big endian */
-#else
-#define ACCT_BYTEORDER 0x00    /* accounting file is little endian */
-#endif
-
-#ifdef __KERNEL__
 
 
 #ifdef CONFIG_BSD_PROCESS_ACCT
@@ -163,12 +65,6 @@ typedef struct acct_v3 acct_t;
 typedef struct acct acct_t;
 #endif
 
-#else
-#define ACCT_VERSION   2
-#define AHZ            (HZ)
-#endif /* __KERNEL */
-
-#ifdef __KERNEL__
 #include <linux/jiffies.h>
 /*
  * Yet another set of HZ to *HZ helper functions.
@@ -210,6 +106,4 @@ static inline u64 nsec_to_AHZ(u64 x)
        return x;
 }
 
-#endif  /* __KERNEL */
-
 #endif /* _LINUX_ACCT_H */
index 63bca502fa55edf8ffd9df6e7c44f2c4c2f83e3c..cde41300c7ad8679964e17447e82b143922d30de 100644 (file)
@@ -4,43 +4,8 @@
 #ifndef __ADB_H
 #define __ADB_H
 
-/* ADB commands */
-#define ADB_BUSRESET           0
-#define ADB_FLUSH(id)          (0x01 | ((id) << 4))
-#define ADB_WRITEREG(id, reg)  (0x08 | (reg) | ((id) << 4))
-#define ADB_READREG(id, reg)   (0x0C | (reg) | ((id) << 4))
+#include <uapi/linux/adb.h>
 
-/* ADB default device IDs (upper 4 bits of ADB command byte) */
-#define ADB_DONGLE     1       /* "software execution control" devices */
-#define ADB_KEYBOARD   2
-#define ADB_MOUSE      3
-#define ADB_TABLET     4
-#define ADB_MODEM      5
-#define ADB_MISC       7       /* maybe a monitor */
-
-#define ADB_RET_OK     0
-#define ADB_RET_TIMEOUT        3
-
-/* The kind of ADB request. The controller may emulate some
-   or all of those CUDA/PMU packet kinds */
-#define ADB_PACKET     0
-#define CUDA_PACKET    1
-#define ERROR_PACKET   2
-#define TIMER_PACKET   3
-#define POWER_PACKET   4
-#define MACIIC_PACKET  5
-#define PMU_PACKET     6
-#define ADB_QUERY      7
-
-/* ADB queries */
-
-/* ADB_QUERY_GETDEVINFO
- * Query ADB slot for device presence
- * data[2] = id, rep[0] = orig addr, rep[1] = handler_id
- */
-#define ADB_QUERY_GETDEVINFO   1
-
-#ifdef __KERNEL__
 
 struct adb_request {
        unsigned char data[32];
@@ -98,6 +63,4 @@ int adb_reset_bus(void);
 int adb_try_handler_change(int address, int new_id);
 int adb_get_infos(int address, int *original_address, int *handler_id);
 
-#endif /* __KERNEL__ */
-
 #endif /* __ADB_H */
index b19801f73890b73f6661910fc64e223d33e76560..0d991071a9d4beb147c2f60e3102723ceac7ffd7 100644 (file)
@@ -1,46 +1,8 @@
 #ifndef _ADFS_FS_H
 #define _ADFS_FS_H
 
-#include <linux/types.h>
-#include <linux/magic.h>
+#include <uapi/linux/adfs_fs.h>
 
-/*
- * Disc Record at disc address 0xc00
- */
-struct adfs_discrecord {
-    __u8  log2secsize;
-    __u8  secspertrack;
-    __u8  heads;
-    __u8  density;
-    __u8  idlen;
-    __u8  log2bpmb;
-    __u8  skew;
-    __u8  bootoption;
-    __u8  lowsector;
-    __u8  nzones;
-    __le16 zone_spare;
-    __le32 root;
-    __le32 disc_size;
-    __le16 disc_id;
-    __u8  disc_name[10];
-    __le32 disc_type;
-    __le32 disc_size_high;
-    __u8  log2sharesize:4;
-    __u8  unused40:4;
-    __u8  big_flag:1;
-    __u8  unused41:1;
-    __u8  nzones_high;
-    __le32 format_version;
-    __le32 root_size;
-    __u8  unused52[60 - 52];
-};
-
-#define ADFS_DISCRECORD                (0xc00)
-#define ADFS_DR_OFFSET         (0x1c0)
-#define ADFS_DR_SIZE            60
-#define ADFS_DR_SIZE_BITS      (ADFS_DR_SIZE << 3)
-
-#ifdef __KERNEL__
 /*
  * Calculate the boot block checksum on an ADFS drive.  Note that this will
  * appear to be correct if the sector contains all zeros, so also check that
@@ -59,5 +21,3 @@ static inline int adfs_checkbblk(unsigned char *ptr)
        return (result & 0xff) != ptr[511];
 }
 #endif
-
-#endif
diff --git a/include/linux/affs_hardblocks.h b/include/linux/affs_hardblocks.h
deleted file mode 100644 (file)
index f1b948c..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef        AFFS_HARDBLOCKS_H
-#define        AFFS_HARDBLOCKS_H
-
-#include <linux/types.h>
-
-/* Just the needed definitions for the RDB of an Amiga HD. */
-
-struct RigidDiskBlock {
-       __u32   rdb_ID;
-       __be32  rdb_SummedLongs;
-       __s32   rdb_ChkSum;
-       __u32   rdb_HostID;
-       __be32  rdb_BlockBytes;
-       __u32   rdb_Flags;
-       __u32   rdb_BadBlockList;
-       __be32  rdb_PartitionList;
-       __u32   rdb_FileSysHeaderList;
-       __u32   rdb_DriveInit;
-       __u32   rdb_Reserved1[6];
-       __u32   rdb_Cylinders;
-       __u32   rdb_Sectors;
-       __u32   rdb_Heads;
-       __u32   rdb_Interleave;
-       __u32   rdb_Park;
-       __u32   rdb_Reserved2[3];
-       __u32   rdb_WritePreComp;
-       __u32   rdb_ReducedWrite;
-       __u32   rdb_StepRate;
-       __u32   rdb_Reserved3[5];
-       __u32   rdb_RDBBlocksLo;
-       __u32   rdb_RDBBlocksHi;
-       __u32   rdb_LoCylinder;
-       __u32   rdb_HiCylinder;
-       __u32   rdb_CylBlocks;
-       __u32   rdb_AutoParkSeconds;
-       __u32   rdb_HighRDSKBlock;
-       __u32   rdb_Reserved4;
-       char    rdb_DiskVendor[8];
-       char    rdb_DiskProduct[16];
-       char    rdb_DiskRevision[4];
-       char    rdb_ControllerVendor[8];
-       char    rdb_ControllerProduct[16];
-       char    rdb_ControllerRevision[4];
-       __u32   rdb_Reserved5[10];
-};
-
-#define        IDNAME_RIGIDDISK        0x5244534B      /* "RDSK" */
-
-struct PartitionBlock {
-       __be32  pb_ID;
-       __be32  pb_SummedLongs;
-       __s32   pb_ChkSum;
-       __u32   pb_HostID;
-       __be32  pb_Next;
-       __u32   pb_Flags;
-       __u32   pb_Reserved1[2];
-       __u32   pb_DevFlags;
-       __u8    pb_DriveName[32];
-       __u32   pb_Reserved2[15];
-       __be32  pb_Environment[17];
-       __u32   pb_EReserved[15];
-};
-
-#define        IDNAME_PARTITION        0x50415254      /* "PART" */
-
-#define RDB_ALLOCATION_LIMIT   16
-
-#endif /* AFFS_HARDBLOCKS_H */
index f6778eceb8f4058bbc932d9ead806968e2a27b6e..c6b61ca97053e933affe7ddd76bc9da792fcbc59 100644 (file)
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-
 #ifndef _AGP_H
 #define _AGP_H 1
 
-#define AGPIOC_BASE       'A'
-#define AGPIOC_INFO       _IOR (AGPIOC_BASE, 0, struct agp_info*)
-#define AGPIOC_ACQUIRE    _IO  (AGPIOC_BASE, 1)
-#define AGPIOC_RELEASE    _IO  (AGPIOC_BASE, 2)
-#define AGPIOC_SETUP      _IOW (AGPIOC_BASE, 3, struct agp_setup*)
-#define AGPIOC_RESERVE    _IOW (AGPIOC_BASE, 4, struct agp_region*)
-#define AGPIOC_PROTECT    _IOW (AGPIOC_BASE, 5, struct agp_region*)
-#define AGPIOC_ALLOCATE   _IOWR(AGPIOC_BASE, 6, struct agp_allocate*)
-#define AGPIOC_DEALLOCATE _IOW (AGPIOC_BASE, 7, int)
-#define AGPIOC_BIND       _IOW (AGPIOC_BASE, 8, struct agp_bind*)
-#define AGPIOC_UNBIND     _IOW (AGPIOC_BASE, 9, struct agp_unbind*)
-#define AGPIOC_CHIPSET_FLUSH _IO (AGPIOC_BASE, 10)
-
-#define AGP_DEVICE      "/dev/agpgart"
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#ifndef __KERNEL__
-#include <linux/types.h>
-
-struct agp_version {
-       __u16 major;
-       __u16 minor;
-};
-
-typedef struct _agp_info {
-       struct agp_version version;     /* version of the driver        */
-       __u32 bridge_id;        /* bridge vendor/device         */
-       __u32 agp_mode;         /* mode info of bridge          */
-       unsigned long aper_base;/* base of aperture             */
-       size_t aper_size;       /* size of aperture             */
-       size_t pg_total;        /* max pages (swap + system)    */
-       size_t pg_system;       /* max pages (system)           */
-       size_t pg_used;         /* current pages used           */
-} agp_info;
-
-typedef struct _agp_setup {
-       __u32 agp_mode;         /* mode info of bridge          */
-} agp_setup;
-
-/*
- * The "prot" down below needs still a "sleep" flag somehow ...
- */
-typedef struct _agp_segment {
-       __kernel_off_t pg_start;        /* starting page to populate    */
-       __kernel_size_t pg_count;       /* number of pages              */
-       int prot;                       /* prot flags for mmap          */
-} agp_segment;
-
-typedef struct _agp_region {
-       __kernel_pid_t pid;             /* pid of process       */
-       __kernel_size_t seg_count;      /* number of segments   */
-       struct _agp_segment *seg_list;
-} agp_region;
-
-typedef struct _agp_allocate {
-       int key;                /* tag of allocation            */
-       __kernel_size_t pg_count;/* number of pages             */
-       __u32 type;             /* 0 == normal, other devspec   */
-       __u32 physical;         /* device specific (some devices  
-                                * need a phys address of the     
-                                * actual page behind the gatt    
-                                * table)                        */
-} agp_allocate;
-
-typedef struct _agp_bind {
-       int key;                /* tag of allocation            */
-       __kernel_off_t pg_start;/* starting page to populate    */
-} agp_bind;
-
-typedef struct _agp_unbind {
-       int key;                /* tag of allocation            */
-       __u32 priority;         /* priority for paging out      */
-} agp_unbind;
-
-#else                          /* __KERNEL__ */
 #include <linux/mutex.h>
 #include <linux/agp_backend.h>
+#include <uapi/linux/agpgart.h>
 
 #define AGPGART_MINOR 175
 
@@ -209,6 +127,4 @@ struct agp_front_data {
        bool backend_acquired;
 };
 
-#endif                         /* __KERNEL__ */
-
 #endif                         /* _AGP_H */
diff --git a/include/linux/aio_abi.h b/include/linux/aio_abi.h
deleted file mode 100644 (file)
index 86fa7a7..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/* include/linux/aio_abi.h
- *
- * Copyright 2000,2001,2002 Red Hat.
- *
- * Written by Benjamin LaHaise <bcrl@kvack.org>
- *
- * Distribute under the terms of the GPLv2 (see ../../COPYING) or under 
- * the following terms.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation is hereby granted, provided that the above copyright
- * notice appears in all copies.  This software is provided without any
- * warranty, express or implied.  Red Hat makes no representations about
- * the suitability of this software for any purpose.
- *
- * IN NO EVENT SHALL RED HAT BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
- * SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
- * THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF RED HAT HAS BEEN ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * RED HAT DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND
- * RED HAT HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
- * ENHANCEMENTS, OR MODIFICATIONS.
- */
-#ifndef __LINUX__AIO_ABI_H
-#define __LINUX__AIO_ABI_H
-
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-typedef __kernel_ulong_t aio_context_t;
-
-enum {
-       IOCB_CMD_PREAD = 0,
-       IOCB_CMD_PWRITE = 1,
-       IOCB_CMD_FSYNC = 2,
-       IOCB_CMD_FDSYNC = 3,
-       /* These two are experimental.
-        * IOCB_CMD_PREADX = 4,
-        * IOCB_CMD_POLL = 5,
-        */
-       IOCB_CMD_NOOP = 6,
-       IOCB_CMD_PREADV = 7,
-       IOCB_CMD_PWRITEV = 8,
-};
-
-/*
- * Valid flags for the "aio_flags" member of the "struct iocb".
- *
- * IOCB_FLAG_RESFD - Set if the "aio_resfd" member of the "struct iocb"
- *                   is valid.
- */
-#define IOCB_FLAG_RESFD                (1 << 0)
-
-/* read() from /dev/aio returns these structures. */
-struct io_event {
-       __u64           data;           /* the data field from the iocb */
-       __u64           obj;            /* what iocb this event came from */
-       __s64           res;            /* result code for this event */
-       __s64           res2;           /* secondary result */
-};
-
-#if defined(__LITTLE_ENDIAN)
-#define PADDED(x,y)    x, y
-#elif defined(__BIG_ENDIAN)
-#define PADDED(x,y)    y, x
-#else
-#error edit for your odd byteorder.
-#endif
-
-/*
- * we always use a 64bit off_t when communicating
- * with userland.  its up to libraries to do the
- * proper padding and aio_error abstraction
- */
-
-struct iocb {
-       /* these are internal to the kernel/libc. */
-       __u64   aio_data;       /* data to be returned in event's data */
-       __u32   PADDED(aio_key, aio_reserved1);
-                               /* the kernel sets aio_key to the req # */
-
-       /* common fields */
-       __u16   aio_lio_opcode; /* see IOCB_CMD_ above */
-       __s16   aio_reqprio;
-       __u32   aio_fildes;
-
-       __u64   aio_buf;
-       __u64   aio_nbytes;
-       __s64   aio_offset;
-
-       /* extra parameters */
-       __u64   aio_reserved2;  /* TODO: use this for a (struct sigevent *) */
-
-       /* flags for the "struct iocb" */
-       __u32   aio_flags;
-
-       /*
-        * if the IOCB_FLAG_RESFD flag of "aio_flags" is set, this is an
-        * eventfd to signal AIO readiness to
-        */
-       __u32   aio_resfd;
-}; /* 64 bytes */
-
-#undef IFBIG
-#undef IFLITTLE
-
-#endif /* __LINUX__AIO_ABI_H */
-
index 01a6244c9bc9b52f0583449d667a1a34f2a95dd7..9c3a87184f48686433bd6f600fac83c7ce5df550 100644 (file)
@@ -1,6 +1,3 @@
-#ifndef _LINUX_APM_H
-#define _LINUX_APM_H
-
 /*
  * Include file for the interface to an APM BIOS
  * Copyright 1994-2001 Stephen Rothwell (sfr@canb.auug.org.au)
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  */
+#ifndef _LINUX_APM_H
+#define _LINUX_APM_H
 
-#include <linux/types.h>
-
-typedef unsigned short apm_event_t;
-typedef unsigned short apm_eventinfo_t;
-
-struct apm_bios_info {
-       __u16   version;
-       __u16   cseg;
-       __u32   offset;
-       __u16   cseg_16;
-       __u16   dseg;
-       __u16   flags;
-       __u16   cseg_len;
-       __u16   cseg_16_len;
-       __u16   dseg_len;
-};
+#include <uapi/linux/apm_bios.h>
 
-#ifdef __KERNEL__
 
 #define APM_CS         (GDT_ENTRY_APMBIOS_BASE * 8)
 #define APM_CS_16      (APM_CS + 8)
@@ -110,111 +93,9 @@ struct apm_info {
  */
 extern struct apm_info apm_info;
 
-#endif /* __KERNEL__ */
-
-/*
- * Power states
- */
-#define APM_STATE_READY                0x0000
-#define APM_STATE_STANDBY      0x0001
-#define APM_STATE_SUSPEND      0x0002
-#define APM_STATE_OFF          0x0003
-#define APM_STATE_BUSY         0x0004
-#define APM_STATE_REJECT       0x0005
-#define APM_STATE_OEM_SYS      0x0020
-#define APM_STATE_OEM_DEV      0x0040
-
-#define APM_STATE_DISABLE      0x0000
-#define APM_STATE_ENABLE       0x0001
-
-#define APM_STATE_DISENGAGE    0x0000
-#define APM_STATE_ENGAGE       0x0001
-
-/*
- * Events (results of Get PM Event)
- */
-#define APM_SYS_STANDBY                0x0001
-#define APM_SYS_SUSPEND                0x0002
-#define APM_NORMAL_RESUME      0x0003
-#define APM_CRITICAL_RESUME    0x0004
-#define APM_LOW_BATTERY                0x0005
-#define APM_POWER_STATUS_CHANGE        0x0006
-#define APM_UPDATE_TIME                0x0007
-#define APM_CRITICAL_SUSPEND   0x0008
-#define APM_USER_STANDBY       0x0009
-#define APM_USER_SUSPEND       0x000a
-#define APM_STANDBY_RESUME     0x000b
-#define APM_CAPABILITY_CHANGE  0x000c
-
-/*
- * Error codes
- */
-#define APM_SUCCESS            0x00
-#define APM_DISABLED           0x01
-#define APM_CONNECTED          0x02
-#define APM_NOT_CONNECTED      0x03
-#define APM_16_CONNECTED       0x05
-#define APM_16_UNSUPPORTED     0x06
-#define APM_32_CONNECTED       0x07
-#define APM_32_UNSUPPORTED     0x08
-#define APM_BAD_DEVICE         0x09
-#define APM_BAD_PARAM          0x0a
-#define APM_NOT_ENGAGED                0x0b
-#define APM_BAD_FUNCTION       0x0c
-#define APM_RESUME_DISABLED    0x0d
-#define APM_NO_ERROR           0x53
-#define APM_BAD_STATE          0x60
-#define APM_NO_EVENTS          0x80
-#define APM_NOT_PRESENT                0x86
-
-/*
- * APM Device IDs
- */
-#define APM_DEVICE_BIOS                0x0000
-#define APM_DEVICE_ALL         0x0001
-#define APM_DEVICE_DISPLAY     0x0100
-#define APM_DEVICE_STORAGE     0x0200
-#define APM_DEVICE_PARALLEL    0x0300
-#define APM_DEVICE_SERIAL      0x0400
-#define APM_DEVICE_NETWORK     0x0500
-#define APM_DEVICE_PCMCIA      0x0600
-#define APM_DEVICE_BATTERY     0x8000
-#define APM_DEVICE_OEM         0xe000
-#define APM_DEVICE_OLD_ALL     0xffff
-#define APM_DEVICE_CLASS       0x00ff
-#define APM_DEVICE_MASK                0xff00
-
-#ifdef __KERNEL__
 /*
  * This is the "All Devices" ID communicated to the BIOS
  */
 #define APM_DEVICE_BALL                ((apm_info.connection_version > 0x0100) ? \
                                 APM_DEVICE_ALL : APM_DEVICE_OLD_ALL)
-#endif
-
-/*
- * Battery status
- */
-#define APM_MAX_BATTERIES      2
-
-/*
- * APM defined capability bit flags
- */
-#define APM_CAP_GLOBAL_STANDBY         0x0001
-#define APM_CAP_GLOBAL_SUSPEND         0x0002
-#define APM_CAP_RESUME_STANDBY_TIMER   0x0004 /* Timer resume from standby */
-#define APM_CAP_RESUME_SUSPEND_TIMER   0x0008 /* Timer resume from suspend */
-#define APM_CAP_RESUME_STANDBY_RING    0x0010 /* Resume on Ring fr standby */
-#define APM_CAP_RESUME_SUSPEND_RING    0x0020 /* Resume on Ring fr suspend */
-#define APM_CAP_RESUME_STANDBY_PCMCIA  0x0040 /* Resume on PCMCIA Ring */
-#define APM_CAP_RESUME_SUSPEND_PCMCIA  0x0080 /* Resume on PCMCIA Ring */
-
-/*
- * ioctl operations
- */
-#include <linux/ioctl.h>
-
-#define APM_IOC_STANDBY                _IO('A', 1)
-#define APM_IOC_SUSPEND                _IO('A', 2)
-
 #endif /* LINUX_APM_H */
diff --git a/include/linux/arcfb.h b/include/linux/arcfb.h
deleted file mode 100644 (file)
index 721e765..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __LINUX_ARCFB_H__
-#define __LINUX_ARCFB_H__
-
-#define FBIO_WAITEVENT         _IO('F', 0x88)
-#define FBIO_GETCONTROL2       _IOR('F', 0x89, size_t)
-
-#endif
-
index f57c36881c4898b24d07897fec211ce03b45dbfa..73fd8b7e9534434d663aa2a18ab5c2a58421b739 100644 (file)
@@ -1,49 +1,9 @@
 #ifndef __LINUX_ATALK_H__
 #define __LINUX_ATALK_H__
 
-#include <linux/types.h>
-#include <asm/byteorder.h>
-#include <linux/socket.h>
-
-/*
- * AppleTalk networking structures
- *
- * The following are directly referenced from the University Of Michigan
- * netatalk for compatibility reasons.
- */
-#define ATPORT_FIRST   1
-#define ATPORT_RESERVED        128
-#define ATPORT_LAST    254             /* 254 is only legal on localtalk */ 
-#define ATADDR_ANYNET  (__u16)0
-#define ATADDR_ANYNODE (__u8)0
-#define ATADDR_ANYPORT  (__u8)0
-#define ATADDR_BCAST   (__u8)255
-#define DDP_MAXSZ      587
-#define DDP_MAXHOPS     15             /* 4 bits of hop counter */
-
-#define SIOCATALKDIFADDR       (SIOCPROTOPRIVATE + 0)
-
-struct atalk_addr {
-       __be16  s_net;
-       __u8    s_node;
-};
-
-struct sockaddr_at {
-       __kernel_sa_family_t sat_family;
-       __u8              sat_port;
-       struct atalk_addr sat_addr;
-       char              sat_zero[8];
-};
-
-struct atalk_netrange {
-       __u8    nr_phase;
-       __be16  nr_firstnet;
-       __be16  nr_lastnet;
-};
-
-#ifdef __KERNEL__
 
 #include <net/sock.h>
+#include <uapi/linux/atalk.h>
 
 struct atalk_route {
        struct net_device  *dev;
@@ -205,5 +165,4 @@ extern void atalk_proc_exit(void);
 #define atalk_proc_exit()      do { } while(0)
 #endif /* CONFIG_PROC_FS */
 
-#endif /* __KERNEL__ */
 #endif /* __LINUX_ATALK_H__ */
index d3b292174aeb0821f8d63c3e6317a1f4d5e8b3d4..30006c4359516970be63aaa3ab788c260fe4eda1 100644 (file)
@@ -1,242 +1,9 @@
 /* atm.h - general ATM declarations */
-/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
-
-/*
- * WARNING: User-space programs should not #include <linux/atm.h> directly.
- *          Instead, #include <atm.h>
- */
-
 #ifndef _LINUX_ATM_H
 #define _LINUX_ATM_H
 
-/*
- * BEGIN_xx and END_xx markers are used for automatic generation of
- * documentation. Do not change them.
- */
-
-#include <linux/compiler.h>
-#include <linux/atmapi.h>
-#include <linux/atmsap.h>
-#include <linux/atmioc.h>
-#include <linux/types.h>
-
-
-/* general ATM constants */
-#define ATM_CELL_SIZE              53  /* ATM cell size incl. header */
-#define ATM_CELL_PAYLOAD           48  /* ATM payload size */
-#define ATM_AAL0_SDU               52  /* AAL0 SDU size */
-#define ATM_MAX_AAL34_PDU       65535  /* maximum AAL3/4 PDU payload */
-#define ATM_AAL5_TRAILER            8  /* AAL5 trailer size */
-#define ATM_MAX_AAL5_PDU        65535  /* maximum AAL5 PDU payload */
-#define ATM_MAX_CDV              9999  /* maximum (default) CDV */
-#define ATM_NOT_RSV_VCI                    32  /* first non-reserved VCI value */
-
-#define ATM_MAX_VPI               255  /* maximum VPI at the UNI */
-#define ATM_MAX_VPI_NNI                  4096  /* maximum VPI at the NNI */
-#define ATM_MAX_VCI             65535  /* maximum VCI */
-
-
-/* "protcol" values for the socket system call */
-#define ATM_NO_AAL     0               /* AAL not specified */
-#define ATM_AAL0       13              /* "raw" ATM cells */
-#define ATM_AAL1       1               /* AAL1 (CBR) */
-#define ATM_AAL2       2               /* AAL2 (VBR) */
-#define ATM_AAL34      3               /* AAL3/4 (data) */
-#define ATM_AAL5       5               /* AAL5 (data) */
-
-/*
- * socket option name coding functions
- *
- * Note that __SO_ENCODE and __SO_LEVEL are somewhat a hack since the
- * << 22 only reserves 9 bits for the level.  On some architectures
- * SOL_SOCKET is 0xFFFF, so that's a bit of a problem
- */
-
-#define __SO_ENCODE(l,n,t)     ((((l) & 0x1FF) << 22) | ((n) << 16) | \
-                               sizeof(t))
-#define __SO_LEVEL_MATCH(c,m)  (((c) >> 22) == ((m) & 0x1FF))
-#define __SO_NUMBER(c)         (((c) >> 16) & 0x3f)
-#define __SO_SIZE(c)           ((c) & 0x3fff)
-
-/*
- * ATM layer
- */
-
-#define SO_SETCLP      __SO_ENCODE(SOL_ATM,0,int)
-                           /* set CLP bit value - TODO */
-#define SO_CIRANGE     __SO_ENCODE(SOL_ATM,1,struct atm_cirange)
-                           /* connection identifier range; socket must be
-                              bound or connected */
-#define SO_ATMQOS      __SO_ENCODE(SOL_ATM,2,struct atm_qos)
-                           /* Quality of Service setting */
-#define SO_ATMSAP      __SO_ENCODE(SOL_ATM,3,struct atm_sap)
-                           /* Service Access Point */
-#define SO_ATMPVC      __SO_ENCODE(SOL_ATM,4,struct sockaddr_atmpvc)
-                           /* "PVC" address (also for SVCs); get only */
-#define SO_MULTIPOINT  __SO_ENCODE(SOL_ATM, 5, int)
-                           /* make this vc a p2mp */
-
-
-/*
- * Note @@@: since the socket layers don't really distinguish the control and
- * the data plane but generally seems to be data plane-centric, any layer is
- * about equally wrong for the SAP. If you have a better idea about this,
- * please speak up ...
- */
-
-
-/* ATM cell header (for AAL0) */
-
-/* BEGIN_CH */
-#define ATM_HDR_GFC_MASK       0xf0000000
-#define ATM_HDR_GFC_SHIFT      28
-#define ATM_HDR_VPI_MASK       0x0ff00000
-#define ATM_HDR_VPI_SHIFT      20
-#define ATM_HDR_VCI_MASK       0x000ffff0
-#define ATM_HDR_VCI_SHIFT      4
-#define ATM_HDR_PTI_MASK       0x0000000e
-#define ATM_HDR_PTI_SHIFT      1
-#define ATM_HDR_CLP            0x00000001
-/* END_CH */
-
-
-/* PTI codings */
-
-/* BEGIN_PTI */
-#define ATM_PTI_US0    0  /* user data cell, congestion not exp, SDU-type 0 */
-#define ATM_PTI_US1    1  /* user data cell, congestion not exp, SDU-type 1 */
-#define ATM_PTI_UCES0  2  /* user data cell, cong. experienced, SDU-type 0 */
-#define ATM_PTI_UCES1  3  /* user data cell, cong. experienced, SDU-type 1 */
-#define ATM_PTI_SEGF5  4  /* segment OAM F5 flow related cell */
-#define ATM_PTI_E2EF5  5  /* end-to-end OAM F5 flow related cell */
-#define ATM_PTI_RSV_RM 6  /* reserved for traffic control/resource mgmt */
-#define ATM_PTI_RSV    7  /* reserved */
-/* END_PTI */
-
-
-/*
- * The following items should stay in linux/atm.h, which should be linked to
- * netatm/atm.h
- */
-
-/* Traffic description */
-
-#define ATM_NONE       0               /* no traffic */
-#define ATM_UBR                1
-#define ATM_CBR                2
-#define ATM_VBR                3
-#define ATM_ABR                4
-#define ATM_ANYCLASS   5               /* compatible with everything */
-
-#define ATM_MAX_PCR    -1              /* maximum available PCR */
-
-struct atm_trafprm {
-       unsigned char   traffic_class;  /* traffic class (ATM_UBR, ...) */
-       int             max_pcr;        /* maximum PCR in cells per second */
-       int             pcr;            /* desired PCR in cells per second */
-       int             min_pcr;        /* minimum PCR in cells per second */
-       int             max_cdv;        /* maximum CDV in microseconds */
-       int             max_sdu;        /* maximum SDU in bytes */
-        /* extra params for ABR */
-        unsigned int   icr;            /* Initial Cell Rate (24-bit) */
-        unsigned int   tbe;            /* Transient Buffer Exposure (24-bit) */ 
-        unsigned int   frtt : 24;      /* Fixed Round Trip Time (24-bit) */
-        unsigned int   rif  : 4;       /* Rate Increment Factor (4-bit) */
-        unsigned int   rdf  : 4;       /* Rate Decrease Factor (4-bit) */
-        unsigned int nrm_pres  :1;      /* nrm present bit */
-        unsigned int trm_pres  :1;             /* rm present bit */
-        unsigned int adtf_pres :1;             /* adtf present bit */
-        unsigned int cdf_pres  :1;     /* cdf present bit*/
-        unsigned int nrm       :3;             /* Max # of Cells for each forward RM cell (3-bit) */
-        unsigned int trm       :3;     /* Time between forward RM cells (3-bit) */    
-       unsigned int adtf      :10;     /* ACR Decrease Time Factor (10-bit) */
-       unsigned int cdf       :3;      /* Cutoff Decrease Factor (3-bit) */
-        unsigned int spare     :9;      /* spare bits */ 
-};
-
-struct atm_qos {
-       struct atm_trafprm txtp;        /* parameters in TX direction */
-       struct atm_trafprm rxtp __ATM_API_ALIGN;
-                                       /* parameters in RX direction */
-       unsigned char aal __ATM_API_ALIGN;
-};
-
-/* PVC addressing */
-
-#define ATM_ITF_ANY    -1              /* "magic" PVC address values */
-#define ATM_VPI_ANY    -1
-#define ATM_VCI_ANY    -1
-#define ATM_VPI_UNSPEC -2
-#define ATM_VCI_UNSPEC -2
-
-
-struct sockaddr_atmpvc {
-       unsigned short  sap_family;     /* address family, AF_ATMPVC  */
-       struct {                        /* PVC address */
-               short   itf;            /* ATM interface */
-               short   vpi;            /* VPI (only 8 bits at UNI) */
-               int     vci;            /* VCI (only 16 bits at UNI) */
-       } sap_addr __ATM_API_ALIGN;     /* PVC address */
-};
-
-/* SVC addressing */
-
-#define        ATM_ESA_LEN     20              /* ATM End System Address length */
-#define ATM_E164_LEN   12              /* maximum E.164 number length */
-
-#define ATM_AFI_DCC    0x39            /* DCC ATM Format */
-#define ATM_AFI_ICD    0x47            /* ICD ATM Format */
-#define ATM_AFI_E164   0x45            /* E.164 ATM Format */
-#define ATM_AFI_LOCAL  0x49            /* Local ATM Format */ 
-
-#define ATM_AFI_DCC_GROUP      0xBD    /* DCC ATM Group Format */
-#define ATM_AFI_ICD_GROUP      0xC5    /* ICD ATM Group Format */
-#define ATM_AFI_E164_GROUP     0xC3    /* E.164 ATM Group Format */
-#define ATM_AFI_LOCAL_GROUP    0xC7    /* Local ATM Group Format */
+#include <uapi/linux/atm.h>
 
-#define ATM_LIJ_NONE   0               /* no leaf-initiated join */
-#define ATM_LIJ                1               /* request joining */
-#define ATM_LIJ_RPJ    2               /* set to root-prompted join */
-#define ATM_LIJ_NJ     3               /* set to network join */
-
-
-struct sockaddr_atmsvc {
-    unsigned short     sas_family;     /* address family, AF_ATMSVC */
-    struct {                           /* SVC address */
-        unsigned char  prv[ATM_ESA_LEN];/* private ATM address */
-        char           pub[ATM_E164_LEN+1]; /* public address (E.164) */
-                                       /* unused addresses must be bzero'ed */
-       char            lij_type;       /* role in LIJ call; one of ATM_LIJ* */
-       __u32   lij_id;         /* LIJ call identifier */
-    } sas_addr __ATM_API_ALIGN;                /* SVC address */
-};
-
-
-static __inline__ int atmsvc_addr_in_use(struct sockaddr_atmsvc addr)
-{
-       return *addr.sas_addr.prv || *addr.sas_addr.pub;
-}
-
-
-static __inline__ int atmpvc_addr_in_use(struct sockaddr_atmpvc addr)
-{
-       return addr.sap_addr.itf || addr.sap_addr.vpi || addr.sap_addr.vci;
-}
-
-
-/*
- * Some stuff for linux/sockios.h
- */
-
-struct atmif_sioc {
-       int number;
-       int length;
-       void __user *arg;
-};
-
-#ifdef __KERNEL__
 #ifdef CONFIG_COMPAT
 #include <linux/compat.h>
 struct compat_atmif_sioc {
@@ -246,6 +13,3 @@ struct compat_atmif_sioc {
 };
 #endif
 #endif
-
-typedef unsigned short atm_backend_t;
-#endif
diff --git a/include/linux/atm_eni.h b/include/linux/atm_eni.h
deleted file mode 100644 (file)
index 34f3179..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/* atm_eni.h - Driver-specific declarations of the ENI driver (for use by
-              driver-specific utilities) */
-
-/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
-
-
-#ifndef LINUX_ATM_ENI_H
-#define LINUX_ATM_ENI_H
-
-#include <linux/atmioc.h>
-
-
-struct eni_multipliers {
-       int tx,rx;      /* values are in percent and must be > 100 */
-};
-
-
-#define ENI_MEMDUMP     _IOW('a',ATMIOC_SARPRV,struct atmif_sioc)
-                                                /* printk memory map */
-#define ENI_SETMULT    _IOW('a',ATMIOC_SARPRV+7,struct atmif_sioc)
-                                               /* set buffer multipliers */
-
-#endif
diff --git a/include/linux/atm_he.h b/include/linux/atm_he.h
deleted file mode 100644 (file)
index 2a7713b..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* atm_he.h */
-
-#ifndef LINUX_ATM_HE_H
-#define LINUX_ATM_HE_H
-
-#include <linux/atmioc.h>
-
-#define HE_GET_REG     _IOW('a', ATMIOC_SARPRV, struct atmif_sioc)
-
-#define HE_REGTYPE_PCI 1
-#define HE_REGTYPE_RCM 2
-#define HE_REGTYPE_TCM 3
-#define HE_REGTYPE_MBOX        4
-
-struct he_ioctl_reg {
-       unsigned addr, val;
-       char type;
-};
-
-#endif /* LINUX_ATM_HE_H */
diff --git a/include/linux/atm_idt77105.h b/include/linux/atm_idt77105.h
deleted file mode 100644 (file)
index 8b72400..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/* atm_idt77105.h - Driver-specific declarations of the IDT77105 driver (for
- * use by driver-specific utilities) */
-
-/* Written 1999 by Greg Banks <gnb@linuxfan.com>. Copied from atm_suni.h. */
-
-
-#ifndef LINUX_ATM_IDT77105_H
-#define LINUX_ATM_IDT77105_H
-
-#include <linux/types.h>
-#include <linux/atmioc.h>
-#include <linux/atmdev.h>
-
-/*
- * Structure for IDT77105_GETSTAT and IDT77105_GETSTATZ ioctls.
- * Pointed to by `arg' in atmif_sioc.
- */
-struct idt77105_stats {
-        __u32 symbol_errors;  /* wire symbol errors */
-        __u32 tx_cells;       /* cells transmitted */
-        __u32 rx_cells;       /* cells received */
-        __u32 rx_hec_errors;  /* Header Error Check errors on receive */
-};
-
-#define IDT77105_GETSTAT       _IOW('a',ATMIOC_PHYPRV+2,struct atmif_sioc)     /* get stats */
-#define IDT77105_GETSTATZ      _IOW('a',ATMIOC_PHYPRV+3,struct atmif_sioc)     /* get stats and zero */
-
-#endif
diff --git a/include/linux/atm_nicstar.h b/include/linux/atm_nicstar.h
deleted file mode 100644 (file)
index 577b79f..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/******************************************************************************
- *
- * atm_nicstar.h
- *
- * Driver-specific declarations for use by NICSTAR driver specific utils.
- *
- * Author: Rui Prior
- *
- * (C) INESC 1998
- *
- ******************************************************************************/
-
-
-#ifndef LINUX_ATM_NICSTAR_H
-#define LINUX_ATM_NICSTAR_H
-
-/* Note: non-kernel programs including this file must also include
- * sys/types.h for struct timeval
- */
-
-#include <linux/atmapi.h>
-#include <linux/atmioc.h>
-
-#define NS_GETPSTAT    _IOWR('a',ATMIOC_SARPRV+1,struct atmif_sioc)
-                                               /* get pool statistics */
-#define NS_SETBUFLEV   _IOW('a',ATMIOC_SARPRV+2,struct atmif_sioc)
-                                               /* set buffer level markers */
-#define NS_ADJBUFLEV   _IO('a',ATMIOC_SARPRV+3)
-                                               /* adjust buffer level */
-
-typedef struct buf_nr
-{
-   unsigned min;
-   unsigned init;
-   unsigned max;
-}buf_nr;
-
-
-typedef struct pool_levels
-{
-   int buftype;
-   int count;          /* (At least for now) only used in NS_GETPSTAT */
-   buf_nr level;
-} pool_levels;
-
-/* type must be one of the following: */
-#define NS_BUFTYPE_SMALL 1
-#define NS_BUFTYPE_LARGE 2
-#define NS_BUFTYPE_HUGE 3
-#define NS_BUFTYPE_IOVEC 4
-
-
-#endif /* LINUX_ATM_NICSTAR_H */
index 375638f8554b93c8338d0d8499688e329c4ffbfb..db6b65fc0aec7fa2bd5526015aedb29c6f5c7f00 100644 (file)
@@ -3,61 +3,11 @@
 
 /* Written 1997-2000 by Werner Almesberger, EPFL LRC/ICA */
 
-
 #ifndef LINUX_ATM_TCP_H
 #define LINUX_ATM_TCP_H
 
-#include <linux/atmapi.h>
-#include <linux/atm.h>
-#include <linux/atmioc.h>
-#include <linux/types.h>
-
-
-/*
- * All values in struct atmtcp_hdr are in network byte order
- */
-
-struct atmtcp_hdr {
-       __u16   vpi;
-       __u16   vci;
-       __u32   length;         /* ... of data part */
-};
-
-/*
- * All values in struct atmtcp_command are in host byte order
- */
-
-#define ATMTCP_HDR_MAGIC       (~0)    /* this length indicates a command */
-#define ATMTCP_CTRL_OPEN       1       /* request/reply */
-#define ATMTCP_CTRL_CLOSE      2       /* request/reply */
+#include <uapi/linux/atm_tcp.h>
 
-struct atmtcp_control {
-       struct atmtcp_hdr hdr;  /* must be first */
-       int type;               /* message type; both directions */
-       atm_kptr_t vcc;         /* both directions */
-       struct sockaddr_atmpvc addr; /* suggested value from kernel */
-       struct atm_qos  qos;    /* both directions */
-       int result;             /* to kernel only */
-} __ATM_API_ALIGN;
-
-/*
- * Field usage:
- * Messge type dir.    hdr.v?i type    addr    qos     vcc     result
- * -----------  ----   ------- ----    ----    ---     ---     ------
- * OPEN                K->D    Y       Y       Y       Y       Y       0
- * OPEN                D->K    -       Y       Y       Y       Y       Y
- * CLOSE       K->D    -       -       Y       -       Y       0
- * CLOSE       D->K    -       -       -       -       Y       Y
- */
-
-#define SIOCSIFATMTCP  _IO('a',ATMIOC_ITF)     /* set ATMTCP mode */
-#define ATMTCP_CREATE  _IO('a',ATMIOC_ITF+14)  /* create persistent ATMTCP
-                                                  interface */
-#define ATMTCP_REMOVE  _IO('a',ATMIOC_ITF+15)  /* destroy persistent ATMTCP
-                                                  interface */
-
-
-#ifdef __KERNEL__
 
 struct atm_tcp_ops {
        int (*attach)(struct atm_vcc *vcc,int itf);
@@ -69,5 +19,3 @@ struct atm_tcp_ops {
 extern struct atm_tcp_ops atm_tcp_ops;
 
 #endif
-
-#endif
diff --git a/include/linux/atm_zatm.h b/include/linux/atm_zatm.h
deleted file mode 100644 (file)
index 10f0fa2..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/* atm_zatm.h - Driver-specific declarations of the ZATM driver (for use by
-               driver-specific utilities) */
-
-/* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */
-
-
-#ifndef LINUX_ATM_ZATM_H
-#define LINUX_ATM_ZATM_H
-
-/*
- * Note: non-kernel programs including this file must also include
- * sys/types.h for struct timeval
- */
-
-#include <linux/atmapi.h>
-#include <linux/atmioc.h>
-
-#define ZATM_GETPOOL   _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc)
-                                               /* get pool statistics */
-#define ZATM_GETPOOLZ  _IOW('a',ATMIOC_SARPRV+2,struct atmif_sioc)
-                                               /* get statistics and zero */
-#define ZATM_SETPOOL   _IOW('a',ATMIOC_SARPRV+3,struct atmif_sioc)
-                                               /* set pool parameters */
-
-struct zatm_pool_info {
-       int ref_count;                  /* free buffer pool usage counters */
-       int low_water,high_water;       /* refill parameters */
-       int rqa_count,rqu_count;        /* queue condition counters */
-       int offset,next_off;            /* alignment optimizations: offset */
-       int next_cnt,next_thres;        /* repetition counter and threshold */
-};
-
-struct zatm_pool_req {
-       int pool_num;                   /* pool number */
-       struct zatm_pool_info info;     /* actual information */
-};
-
-struct zatm_t_hist {
-       struct timeval real;            /* real (wall-clock) time */
-       struct timeval expected;        /* expected real time */
-};
-
-
-#define ZATM_OAM_POOL          0       /* free buffer pool for OAM cells */
-#define ZATM_AAL0_POOL         1       /* free buffer pool for AAL0 cells */
-#define ZATM_AAL5_POOL_BASE    2       /* first AAL5 free buffer pool */
-#define ZATM_LAST_POOL ZATM_AAL5_POOL_BASE+10 /* max. 64 kB */
-
-#define ZATM_TIMER_HISTORY_SIZE        16      /* number of timer adjustments to
-                                          record; must be 2^n */
-
-#endif
diff --git a/include/linux/atmapi.h b/include/linux/atmapi.h
deleted file mode 100644 (file)
index 8fe54d9..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/* atmapi.h - ATM API user space/kernel compatibility */
-/* Written 1999,2000 by Werner Almesberger, EPFL ICA */
-
-#ifndef _LINUX_ATMAPI_H
-#define _LINUX_ATMAPI_H
-
-#if defined(__sparc__) || defined(__ia64__)
-/* such alignment is not required on 32 bit sparcs, but we can't
-   figure that we are on a sparc64 while compiling user-space programs. */
-#define __ATM_API_ALIGN        __attribute__((aligned(8)))
-#else
-#define __ATM_API_ALIGN
-#endif
-
-
-/*
- * Opaque type for kernel pointers. Note that _ is never accessed. We need
- * the struct in order hide the array, so that we can make simple assignments
- * instead of being forced to use memcpy. It also improves error reporting for
- * code that still assumes that we're passing unsigned longs.
- *
- * Convention: NULL pointers are passed as a field of all zeroes.
- */
-typedef struct { unsigned char _[8]; } __ATM_API_ALIGN atm_kptr_t;
-
-#endif
diff --git a/include/linux/atmarp.h b/include/linux/atmarp.h
deleted file mode 100644 (file)
index 231f4bd..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/* atmarp.h - ATM ARP protocol and kernel-demon interface definitions */
-/* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */
-
-#ifndef _LINUX_ATMARP_H
-#define _LINUX_ATMARP_H
-
-#include <linux/types.h>
-#include <linux/atmapi.h>
-#include <linux/atmioc.h>
-
-
-#define ATMARP_RETRY_DELAY 30          /* request next resolution or forget
-                                          NAK after 30 sec - should go into
-                                          atmclip.h */
-#define ATMARP_MAX_UNRES_PACKETS 5     /* queue that many packets while
-                                          waiting for the resolver */
-
-
-#define ATMARPD_CTRL   _IO('a',ATMIOC_CLIP+1)  /* become atmarpd ctrl sock */
-#define ATMARP_MKIP    _IO('a',ATMIOC_CLIP+2)  /* attach socket to IP */
-#define ATMARP_SETENTRY        _IO('a',ATMIOC_CLIP+3)  /* fill or hide ARP entry */
-#define ATMARP_ENCAP   _IO('a',ATMIOC_CLIP+5)  /* change encapsulation */
-
-
-enum atmarp_ctrl_type {
-       act_invalid,            /* catch uninitialized structures */
-       act_need,               /* need address resolution */
-       act_up,                 /* interface is coming up */
-       act_down,               /* interface is going down */
-       act_change              /* interface configuration has changed */
-};
-
-struct atmarp_ctrl {
-       enum atmarp_ctrl_type   type;   /* message type */
-       int                     itf_num;/* interface number (if present) */
-       __be32                  ip;     /* IP address (act_need only) */
-};
-
-#endif
diff --git a/include/linux/atmbr2684.h b/include/linux/atmbr2684.h
deleted file mode 100644 (file)
index fdb2629..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef _LINUX_ATMBR2684_H
-#define _LINUX_ATMBR2684_H
-
-#include <linux/types.h>
-#include <linux/atm.h>
-#include <linux/if.h>          /* For IFNAMSIZ */
-
-/*
- * Type of media we're bridging (ethernet, token ring, etc)  Currently only
- * ethernet is supported
- */
-#define BR2684_MEDIA_ETHERNET  (0)     /* 802.3 */
-#define BR2684_MEDIA_802_4     (1)     /* 802.4 */
-#define BR2684_MEDIA_TR                (2)     /* 802.5 - token ring */
-#define BR2684_MEDIA_FDDI      (3)
-#define BR2684_MEDIA_802_6     (4)     /* 802.6 */
-
-                                       /* used only at device creation:  */
-#define BR2684_FLAG_ROUTED     (1<<16) /* payload is routed, not bridged */
-
-/*
- * Is there FCS inbound on this VC?  This currently isn't supported.
- */
-#define BR2684_FCSIN_NO                (0)
-#define BR2684_FCSIN_IGNORE    (1)
-#define BR2684_FCSIN_VERIFY    (2)
-
-/*
- * Is there FCS outbound on this VC?  This currently isn't supported.
- */
-#define BR2684_FCSOUT_NO       (0)
-#define BR2684_FCSOUT_SENDZERO (1)
-#define BR2684_FCSOUT_GENERATE (2)
-
-/*
- * Does this VC include LLC encapsulation?
- */
-#define BR2684_ENCAPS_VC       (0)     /* VC-mux */
-#define BR2684_ENCAPS_LLC      (1)
-#define BR2684_ENCAPS_AUTODETECT (2)   /* Unsuported */
-
-/*
- * Is this VC bridged or routed?
- */
-
-#define BR2684_PAYLOAD_ROUTED   (0)
-#define BR2684_PAYLOAD_BRIDGED  (1)
-
-/*
- * This is for the ATM_NEWBACKENDIF call - these are like socket families:
- * the first element of the structure is the backend number and the rest
- * is per-backend specific
- */
-struct atm_newif_br2684 {
-       atm_backend_t backend_num;      /* ATM_BACKEND_BR2684 */
-       int media;              /* BR2684_MEDIA_*, flags in upper bits */
-       char ifname[IFNAMSIZ];
-       int mtu;
-};
-
-/*
- * This structure is used to specify a br2684 interface - either by a
- * positive integer (returned by ATM_NEWBACKENDIF) or the interfaces name
- */
-#define BR2684_FIND_BYNOTHING  (0)
-#define BR2684_FIND_BYNUM      (1)
-#define BR2684_FIND_BYIFNAME   (2)
-struct br2684_if_spec {
-       int method;             /* BR2684_FIND_* */
-       union {
-               char ifname[IFNAMSIZ];
-               int devnum;
-       } spec;
-};
-
-/*
- * This is for the ATM_SETBACKEND call - these are like socket families:
- * the first element of the structure is the backend number and the rest
- * is per-backend specific
- */
-struct atm_backend_br2684 {
-       atm_backend_t backend_num;      /* ATM_BACKEND_BR2684 */
-       struct br2684_if_spec ifspec;
-       int fcs_in;             /* BR2684_FCSIN_* */
-       int fcs_out;            /* BR2684_FCSOUT_* */
-       int fcs_auto;           /* 1: fcs_{in,out} disabled if no FCS rx'ed */
-       int encaps;             /* BR2684_ENCAPS_* */
-       int has_vpiid;          /* 1: use vpn_id - Unsupported */
-       __u8 vpn_id[7];
-       int send_padding;       /* unsupported */
-       int min_size;           /* we will pad smaller packets than this */
-};
-
-/*
- * The BR2684_SETFILT ioctl is an experimental mechanism for folks
- * terminating a large number of IP-only vcc's.  When netfilter allows
- * efficient per-if in/out filters, this support will be removed
- */
-struct br2684_filter {
-       __be32 prefix;          /* network byte order */
-       __be32 netmask;         /* 0 = disable filter */
-};
-
-struct br2684_filter_set {
-       struct br2684_if_spec ifspec;
-       struct br2684_filter filter;
-};
-
-enum br2684_payload {
-       p_routed = BR2684_PAYLOAD_ROUTED,
-       p_bridged = BR2684_PAYLOAD_BRIDGED,
-};
-
-#define BR2684_SETFILT _IOW( 'a', ATMIOC_BACKEND + 0, \
-                               struct br2684_filter_set)
-
-#endif /* _LINUX_ATMBR2684_H */
diff --git a/include/linux/atmclip.h b/include/linux/atmclip.h
deleted file mode 100644 (file)
index 02c94c4..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* atmclip.h - Classical IP over ATM */
-/* Written 1995-1998 by Werner Almesberger, EPFL LRC/ICA */
-
-#ifndef LINUX_ATMCLIP_H
-#define LINUX_ATMCLIP_H
-
-#include <linux/sockios.h>
-#include <linux/atmioc.h>
-
-
-#define RFC1483LLC_LEN 8               /* LLC+OUI+PID = 8 */
-#define RFC1626_MTU    9180            /* RFC1626 default MTU */
-
-#define CLIP_DEFAULT_IDLETIMER 1200    /* 20 minutes, see RFC1755 */
-#define CLIP_CHECK_INTERVAL     10     /* check every ten seconds */
-
-#define        SIOCMKCLIP      _IO('a',ATMIOC_CLIP)    /* create IP interface */
-
-#endif
index 06fd4bbc58f68c17c2e93b7b05385159e41dc6ea..22ef21c33d0c600f5adf48d34e5bdde4687d76c4 100644 (file)
@@ -1,218 +1,8 @@
 /* atmdev.h - ATM device driver declarations and various related items */
-/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
-
 #ifndef LINUX_ATMDEV_H
 #define LINUX_ATMDEV_H
 
 
-#include <linux/atmapi.h>
-#include <linux/atm.h>
-#include <linux/atmioc.h>
-
-
-#define ESI_LEN                6
-
-#define ATM_OC3_PCR    (155520000/270*260/8/53)
-                       /* OC3 link rate:  155520000 bps
-                          SONET overhead: /270*260 (9 section, 1 path)
-                          bits per cell:  /8/53
-                          max cell rate:  353207.547 cells/sec */
-#define ATM_25_PCR     ((25600000/8-8000)/54)
-                       /* 25 Mbps ATM cell rate (59111) */
-#define ATM_OC12_PCR   (622080000/1080*1040/8/53)
-                       /* OC12 link rate: 622080000 bps
-                          SONET overhead: /1080*1040
-                          bits per cell:  /8/53
-                          max cell rate:  1412830.188 cells/sec */
-#define ATM_DS3_PCR    (8000*12)
-                       /* DS3: 12 cells in a 125 usec time slot */
-
-
-#define __AAL_STAT_ITEMS \
-    __HANDLE_ITEM(tx);                 /* TX okay */ \
-    __HANDLE_ITEM(tx_err);             /* TX errors */ \
-    __HANDLE_ITEM(rx);                 /* RX okay */ \
-    __HANDLE_ITEM(rx_err);             /* RX errors */ \
-    __HANDLE_ITEM(rx_drop);            /* RX out of memory */
-
-struct atm_aal_stats {
-#define __HANDLE_ITEM(i) int i
-       __AAL_STAT_ITEMS
-#undef __HANDLE_ITEM
-};
-
-
-struct atm_dev_stats {
-       struct atm_aal_stats aal0;
-       struct atm_aal_stats aal34;
-       struct atm_aal_stats aal5;
-} __ATM_API_ALIGN;
-
-
-#define ATM_GETLINKRATE        _IOW('a',ATMIOC_ITF+1,struct atmif_sioc)
-                                       /* get link rate */
-#define ATM_GETNAMES   _IOW('a',ATMIOC_ITF+3,struct atm_iobuf)
-                                       /* get interface names (numbers) */
-#define ATM_GETTYPE    _IOW('a',ATMIOC_ITF+4,struct atmif_sioc)
-                                       /* get interface type name */
-#define ATM_GETESI     _IOW('a',ATMIOC_ITF+5,struct atmif_sioc)
-                                       /* get interface ESI */
-#define ATM_GETADDR    _IOW('a',ATMIOC_ITF+6,struct atmif_sioc)
-                                       /* get itf's local ATM addr. list */
-#define ATM_RSTADDR    _IOW('a',ATMIOC_ITF+7,struct atmif_sioc)
-                                       /* reset itf's ATM address list */
-#define ATM_ADDADDR    _IOW('a',ATMIOC_ITF+8,struct atmif_sioc)
-                                       /* add a local ATM address */
-#define ATM_DELADDR    _IOW('a',ATMIOC_ITF+9,struct atmif_sioc)
-                                       /* remove a local ATM address */
-#define ATM_GETCIRANGE _IOW('a',ATMIOC_ITF+10,struct atmif_sioc)
-                                       /* get connection identifier range */
-#define ATM_SETCIRANGE _IOW('a',ATMIOC_ITF+11,struct atmif_sioc)
-                                       /* set connection identifier range */
-#define ATM_SETESI     _IOW('a',ATMIOC_ITF+12,struct atmif_sioc)
-                                       /* set interface ESI */
-#define ATM_SETESIF    _IOW('a',ATMIOC_ITF+13,struct atmif_sioc)
-                                       /* force interface ESI */
-#define ATM_ADDLECSADDR        _IOW('a', ATMIOC_ITF+14, struct atmif_sioc)
-                                       /* register a LECS address */
-#define ATM_DELLECSADDR        _IOW('a', ATMIOC_ITF+15, struct atmif_sioc)
-                                       /* unregister a LECS address */
-#define ATM_GETLECSADDR        _IOW('a', ATMIOC_ITF+16, struct atmif_sioc)
-                                       /* retrieve LECS address(es) */
-
-#define ATM_GETSTAT    _IOW('a',ATMIOC_SARCOM+0,struct atmif_sioc)
-                                       /* get AAL layer statistics */
-#define ATM_GETSTATZ   _IOW('a',ATMIOC_SARCOM+1,struct atmif_sioc)
-                                       /* get AAL layer statistics and zero */
-#define ATM_GETLOOP    _IOW('a',ATMIOC_SARCOM+2,struct atmif_sioc)
-                                       /* get loopback mode */
-#define ATM_SETLOOP    _IOW('a',ATMIOC_SARCOM+3,struct atmif_sioc)
-                                       /* set loopback mode */
-#define ATM_QUERYLOOP  _IOW('a',ATMIOC_SARCOM+4,struct atmif_sioc)
-                                       /* query supported loopback modes */
-#define ATM_SETSC      _IOW('a',ATMIOC_SPECIAL+1,int)
-                                       /* enable or disable single-copy */
-#define ATM_SETBACKEND _IOW('a',ATMIOC_SPECIAL+2,atm_backend_t)
-                                       /* set backend handler */
-#define ATM_NEWBACKENDIF _IOW('a',ATMIOC_SPECIAL+3,atm_backend_t)
-                                       /* use backend to make new if */
-#define ATM_ADDPARTY   _IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
-                                       /* add party to p2mp call */
-#ifdef CONFIG_COMPAT
-/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */
-#define COMPAT_ATM_ADDPARTY    _IOW('a', ATMIOC_SPECIAL+4,struct compat_atm_iobuf)
-#endif
-#define ATM_DROPPARTY  _IOW('a', ATMIOC_SPECIAL+5,int)
-                                       /* drop party from p2mp call */
-
-/*
- * These are backend handkers that can be set via the ATM_SETBACKEND call
- * above.  In the future we may support dynamic loading of these - for now,
- * they're just being used to share the ATMIOC_BACKEND ioctls
- */
-#define ATM_BACKEND_RAW                0       
-#define ATM_BACKEND_PPP                1       /* PPPoATM - RFC2364 */
-#define ATM_BACKEND_BR2684     2       /* Bridged RFC1483/2684 */
-
-/* for ATM_GETTYPE */
-#define ATM_ITFTYP_LEN 8       /* maximum length of interface type name */
-
-/*
- * Loopback modes for ATM_{PHY,SAR}_{GET,SET}LOOP
- */
-
-/* Point of loopback                           CPU-->SAR-->PHY-->line--> ... */
-#define __ATM_LM_NONE  0       /* no loop back     ^     ^     ^      ^      */
-#define __ATM_LM_AAL   1       /* loop back PDUs --'     |     |      |      */
-#define __ATM_LM_ATM   2       /* loop back ATM cells ---'     |      |      */
-/* RESERVED            4       loop back on PHY side  ---'                   */
-#define __ATM_LM_PHY   8       /* loop back bits (digital) ----'      |      */
-#define __ATM_LM_ANALOG 16     /* loop back the analog signal --------'      */
-
-/* Direction of loopback */
-#define __ATM_LM_MKLOC(n)      ((n))       /* Local (i.e. loop TX to RX) */
-#define __ATM_LM_MKRMT(n)      ((n) << 8)  /* Remote (i.e. loop RX to TX) */
-
-#define __ATM_LM_XTLOC(n)      ((n) & 0xff)
-#define __ATM_LM_XTRMT(n)      (((n) >> 8) & 0xff)
-
-#define ATM_LM_NONE    0       /* no loopback */
-
-#define ATM_LM_LOC_AAL __ATM_LM_MKLOC(__ATM_LM_AAL)
-#define ATM_LM_LOC_ATM __ATM_LM_MKLOC(__ATM_LM_ATM)
-#define ATM_LM_LOC_PHY __ATM_LM_MKLOC(__ATM_LM_PHY)
-#define ATM_LM_LOC_ANALOG __ATM_LM_MKLOC(__ATM_LM_ANALOG)
-
-#define ATM_LM_RMT_AAL __ATM_LM_MKRMT(__ATM_LM_AAL)
-#define ATM_LM_RMT_ATM __ATM_LM_MKRMT(__ATM_LM_ATM)
-#define ATM_LM_RMT_PHY __ATM_LM_MKRMT(__ATM_LM_PHY)
-#define ATM_LM_RMT_ANALOG __ATM_LM_MKRMT(__ATM_LM_ANALOG)
-
-/*
- * Note: ATM_LM_LOC_* and ATM_LM_RMT_* can be combined, provided that
- * __ATM_LM_XTLOC(x) <= __ATM_LM_XTRMT(x)
- */
-
-
-struct atm_iobuf {
-       int length;
-       void __user *buffer;
-};
-
-/* for ATM_GETCIRANGE / ATM_SETCIRANGE */
-
-#define ATM_CI_MAX      -1              /* use maximum range of VPI/VCI */
-struct atm_cirange {
-       signed char     vpi_bits;       /* 1..8, ATM_CI_MAX (-1) for maximum */
-       signed char     vci_bits;       /* 1..16, ATM_CI_MAX (-1) for maximum */
-};
-
-/* for ATM_SETSC; actually taken from the ATM_VF number space */
-
-#define ATM_SC_RX      1024            /* enable RX single-copy */
-#define ATM_SC_TX      2048            /* enable TX single-copy */
-
-#define ATM_BACKLOG_DEFAULT 32 /* if we get more, we're likely to time out
-                                 anyway */
-
-/* MF: change_qos (Modify) flags */
-
-#define ATM_MF_IMMED    1      /* Block until change is effective */
-#define ATM_MF_INC_RSV  2      /* Change reservation on increase */
-#define ATM_MF_INC_SHP  4      /* Change shaping on increase */
-#define ATM_MF_DEC_RSV  8      /* Change reservation on decrease */
-#define ATM_MF_DEC_SHP 16      /* Change shaping on decrease */
-#define ATM_MF_BWD     32      /* Set the backward direction parameters */
-
-#define ATM_MF_SET     (ATM_MF_INC_RSV | ATM_MF_INC_SHP | ATM_MF_DEC_RSV | \
-                         ATM_MF_DEC_SHP | ATM_MF_BWD)
-
-/*
- * ATM_VS_* are used to express VC state in a human-friendly way.
- */
-
-#define ATM_VS_IDLE    0       /* VC is not used */
-#define ATM_VS_CONNECTED 1     /* VC is connected */
-#define ATM_VS_CLOSING 2       /* VC is closing */
-#define ATM_VS_LISTEN  3       /* VC is listening for incoming setups */
-#define ATM_VS_INUSE   4       /* VC is in use (registered with atmsigd) */
-#define ATM_VS_BOUND   5       /* VC is bound */
-
-#define ATM_VS2TXT_MAP \
-    "IDLE", "CONNECTED", "CLOSING", "LISTEN", "INUSE", "BOUND"
-
-#define ATM_VF2TXT_MAP \
-    "ADDR",    "READY",        "PARTIAL",      "REGIS", \
-    "RELEASED", "HASQOS",      "LISTEN",       "META", \
-    "256",     "512",          "1024",         "2048", \
-    "SESSION", "HASSAP",       "BOUND",        "CLOSE"
-
-
-#ifdef __KERNEL__
-
 #include <linux/wait.h> /* wait_queue_head_t */
 #include <linux/time.h> /* struct timeval */
 #include <linux/net.h>
@@ -221,6 +11,7 @@ struct atm_cirange {
 #include <linux/uio.h>
 #include <net/sock.h>
 #include <linux/atomic.h>
+#include <uapi/linux/atmdev.h>
 
 #ifdef CONFIG_PROC_FS
 #include <linux/proc_fs.h>
@@ -521,6 +312,4 @@ void deregister_atm_ioctl(struct atm_ioctl *);
 int register_atmdevice_notifier(struct notifier_block *nb);
 void unregister_atmdevice_notifier(struct notifier_block *nb);
 
-#endif /* __KERNEL__ */
-
 #endif
diff --git a/include/linux/atmioc.h b/include/linux/atmioc.h
deleted file mode 100644 (file)
index 37f67aa..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/* atmioc.h - ranges for ATM-related ioctl numbers */
-/* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */
-
-
-/*
- * See http://icawww1.epfl.ch/linux-atm/magic.html for the complete list of
- * "magic" ioctl numbers.
- */
-
-
-#ifndef _LINUX_ATMIOC_H
-#define _LINUX_ATMIOC_H
-
-#include <asm/ioctl.h>
-               /* everybody including atmioc.h will also need _IO{,R,W,WR} */
-
-#define ATMIOC_PHYCOM    0x00 /* PHY device common ioctls, globally unique */
-#define ATMIOC_PHYCOM_END 0x0f
-#define ATMIOC_PHYTYP    0x10 /* PHY dev type ioctls, unique per PHY type */
-#define ATMIOC_PHYTYP_END 0x2f
-#define ATMIOC_PHYPRV    0x30 /* PHY dev private ioctls, unique per driver */
-#define ATMIOC_PHYPRV_END 0x4f
-#define ATMIOC_SARCOM    0x50 /* SAR device common ioctls, globally unique */
-#define ATMIOC_SARCOM_END 0x50
-#define ATMIOC_SARPRV    0x60 /* SAR dev private ioctls, unique per driver */
-#define ATMIOC_SARPRV_END 0x7f
-#define ATMIOC_ITF       0x80 /* Interface ioctls, globally unique */
-#define ATMIOC_ITF_END   0x8f
-#define ATMIOC_BACKEND   0x90 /* ATM generic backend ioctls, u. per backend */
-#define ATMIOC_BACKEND_END 0xaf
-/* 0xb0-0xbf: Reserved for future use */
-#define ATMIOC_AREQUIPA          0xc0 /* Application requested IP over ATM, glob. u. */
-#define ATMIOC_LANE      0xd0 /* LAN Emulation, globally unique */
-#define ATMIOC_MPOA       0xd8 /* MPOA, globally unique */
-#define        ATMIOC_CLIP       0xe0 /* Classical IP over ATM control, globally u. */
-#define        ATMIOC_CLIP_END   0xef
-#define        ATMIOC_SPECIAL    0xf0 /* Special-purpose controls, globally unique */
-#define        ATMIOC_SPECIAL_END 0xff
-
-#endif
diff --git a/include/linux/atmlec.h b/include/linux/atmlec.h
deleted file mode 100644 (file)
index 302791e..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * ATM Lan Emulation Daemon driver interface
- *
- * Marko Kiiskila <mkiiskila@yahoo.com>
- */
-
-#ifndef _ATMLEC_H_
-#define _ATMLEC_H_
-
-#include <linux/atmapi.h>
-#include <linux/atmioc.h>
-#include <linux/atm.h>
-#include <linux/if_ether.h>
-#include <linux/types.h>
-
-/* ATM lec daemon control socket */
-#define ATMLEC_CTRL    _IO('a', ATMIOC_LANE)
-#define ATMLEC_DATA    _IO('a', ATMIOC_LANE+1)
-#define ATMLEC_MCAST   _IO('a', ATMIOC_LANE+2)
-
-/* Maximum number of LEC interfaces (tweakable) */
-#define MAX_LEC_ITF 48
-
-typedef enum {
-       l_set_mac_addr,
-       l_del_mac_addr,
-       l_svc_setup,
-       l_addr_delete,
-       l_topology_change,
-       l_flush_complete,
-       l_arp_update,
-       l_narp_req,             /* LANE2 mandates the use of this */
-       l_config,
-       l_flush_tran_id,
-       l_set_lecid,
-       l_arp_xmt,
-       l_rdesc_arp_xmt,
-       l_associate_req,
-       l_should_bridge         /* should we bridge this MAC? */
-} atmlec_msg_type;
-
-#define ATMLEC_MSG_TYPE_MAX l_should_bridge
-
-struct atmlec_config_msg {
-       unsigned int maximum_unknown_frame_count;
-       unsigned int max_unknown_frame_time;
-       unsigned short max_retry_count;
-       unsigned int aging_time;
-       unsigned int forward_delay_time;
-       unsigned int arp_response_time;
-       unsigned int flush_timeout;
-       unsigned int path_switching_delay;
-       unsigned int lane_version;      /* LANE2: 1 for LANEv1, 2 for LANEv2 */
-       int mtu;
-       int is_proxy;
-};
-
-struct atmlec_msg {
-       atmlec_msg_type type;
-       int sizeoftlvs;         /* LANE2: if != 0, tlvs follow */
-       union {
-               struct {
-                       unsigned char mac_addr[ETH_ALEN];
-                       unsigned char atm_addr[ATM_ESA_LEN];
-                       unsigned int flag;      /*
-                                                * Topology_change flag,
-                                                * remoteflag, permanent flag,
-                                                * lecid, transaction id
-                                                */
-                       unsigned int targetless_le_arp; /* LANE2 */
-                       unsigned int no_source_le_narp; /* LANE2 */
-               } normal;
-               struct atmlec_config_msg config;
-               struct {
-                       __u16 lec_id;                           /* requestor lec_id  */
-                       __u32 tran_id;                          /* transaction id    */
-                       unsigned char mac_addr[ETH_ALEN];       /* dst mac addr      */
-                       unsigned char atm_addr[ATM_ESA_LEN];    /* reqestor ATM addr */
-               } proxy;        /*
-                                * For mapping LE_ARP requests to responses. Filled by
-                                * zeppelin, returned by kernel. Used only when proxying
-                                */
-       } content;
-} __ATM_API_ALIGN;
-
-struct atmlec_ioc {
-       int dev_num;
-       unsigned char atm_addr[ATM_ESA_LEN];
-       unsigned char receive;  /* 1= receive vcc, 0 = send vcc */
-};
-#endif /* _ATMLEC_H_ */
diff --git a/include/linux/atmmpc.h b/include/linux/atmmpc.h
deleted file mode 100644 (file)
index 2aba578..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-#ifndef _ATMMPC_H_
-#define _ATMMPC_H_
-
-#include <linux/atmapi.h>
-#include <linux/atmioc.h>
-#include <linux/atm.h>
-#include <linux/types.h>
-
-#define ATMMPC_CTRL _IO('a', ATMIOC_MPOA)
-#define ATMMPC_DATA _IO('a', ATMIOC_MPOA+1)
-
-#define MPC_SOCKET_INGRESS 1
-#define MPC_SOCKET_EGRESS  2
-
-struct atmmpc_ioc {
-        int dev_num;
-        __be32 ipaddr;              /* the IP address of the shortcut    */
-        int type;                     /* ingress or egress                 */
-};
-
-typedef struct in_ctrl_info {
-        __u8   Last_NHRP_CIE_code;
-        __u8   Last_Q2931_cause_value;
-        __u8   eg_MPC_ATM_addr[ATM_ESA_LEN];
-        __be32  tag;
-        __be32  in_dst_ip;      /* IP address this ingress MPC sends packets to */
-        __u16  holding_time;
-        __u32  request_id;
-} in_ctrl_info;
-
-typedef struct eg_ctrl_info {
-        __u8   DLL_header[256];
-        __u8   DH_length;
-        __be32  cache_id;
-        __be32  tag;
-        __be32  mps_ip;
-        __be32  eg_dst_ip;      /* IP address to which ingress MPC sends packets */
-        __u8   in_MPC_data_ATM_addr[ATM_ESA_LEN];
-        __u16  holding_time;
-} eg_ctrl_info;
-
-struct mpc_parameters {
-        __u16 mpc_p1;   /* Shortcut-Setup Frame Count    */
-        __u16 mpc_p2;   /* Shortcut-Setup Frame Time     */
-        __u8 mpc_p3[8]; /* Flow-detection Protocols      */
-        __u16 mpc_p4;   /* MPC Initial Retry Time        */
-        __u16 mpc_p5;   /* MPC Retry Time Maximum        */
-        __u16 mpc_p6;   /* Hold Down Time                */
-} ;
-
-struct k_message {
-        __u16 type;
-        __be32 ip_mask;
-        __u8  MPS_ctrl[ATM_ESA_LEN];
-        union {
-                in_ctrl_info in_info;
-                eg_ctrl_info eg_info;
-                struct mpc_parameters params;
-        } content;
-        struct atm_qos qos;       
-} __ATM_API_ALIGN;
-
-struct llc_snap_hdr {
-       /* RFC 1483 LLC/SNAP encapsulation for routed IP PDUs */
-        __u8  dsap;    /* Destination Service Access Point (0xAA)     */
-        __u8  ssap;    /* Source Service Access Point      (0xAA)     */
-        __u8  ui;      /* Unnumbered Information           (0x03)     */
-        __u8  org[3];  /* Organizational identification    (0x000000) */
-        __u8  type[2]; /* Ether type (for IP)              (0x0800)   */
-};
-
-/* TLVs this MPC recognizes */
-#define TLV_MPOA_DEVICE_TYPE         0x00a03e2a  
-
-/* MPOA device types in MPOA Device Type TLV */
-#define NON_MPOA    0
-#define MPS         1
-#define MPC         2
-#define MPS_AND_MPC 3
-
-
-/* MPC parameter defaults */
-
-#define MPC_P1 10  /* Shortcut-Setup Frame Count  */ 
-#define MPC_P2 1   /* Shortcut-Setup Frame Time   */
-#define MPC_P3 0   /* Flow-detection Protocols    */
-#define MPC_P4 5   /* MPC Initial Retry Time      */
-#define MPC_P5 40  /* MPC Retry Time Maximum      */
-#define MPC_P6 160 /* Hold Down Time              */
-#define HOLDING_TIME_DEFAULT 1200 /* same as MPS-p7 */
-
-/* MPC constants */
-
-#define MPC_C1 2   /* Retry Time Multiplier       */
-#define MPC_C2 60  /* Initial Keep-Alive Lifetime */
-
-/* Message types - to MPOA daemon */
-
-#define SND_MPOA_RES_RQST    201
-#define SET_MPS_CTRL_ADDR    202
-#define SND_MPOA_RES_RTRY    203 /* Different type in a retry due to req id         */
-#define STOP_KEEP_ALIVE_SM   204
-#define EGRESS_ENTRY_REMOVED 205
-#define SND_EGRESS_PURGE     206
-#define DIE                  207 /* tell the daemon to exit()                       */
-#define DATA_PLANE_PURGE     208 /* Data plane purge because of egress cache hit miss or dead MPS */
-#define OPEN_INGRESS_SVC     209
-
-/* Message types - from MPOA daemon */
-
-#define MPOA_TRIGGER_RCVD     101
-#define MPOA_RES_REPLY_RCVD   102
-#define INGRESS_PURGE_RCVD    103
-#define EGRESS_PURGE_RCVD     104
-#define MPS_DEATH             105
-#define CACHE_IMPOS_RCVD      106
-#define SET_MPC_CTRL_ADDR     107 /* Our MPC's control ATM address   */
-#define SET_MPS_MAC_ADDR      108
-#define CLEAN_UP_AND_EXIT     109
-#define SET_MPC_PARAMS        110 /* MPC configuration parameters    */
-
-/* Message types - bidirectional */       
-
-#define RELOAD                301 /* kill -HUP the daemon for reload */
-
-#endif /* _ATMMPC_H_ */
diff --git a/include/linux/atmppp.h b/include/linux/atmppp.h
deleted file mode 100644 (file)
index 300dcce..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/* atmppp.h - RFC2364 PPPoATM */
-
-/* Written 2000 by Mitchell Blank Jr */
-
-#ifndef _LINUX_ATMPPP_H
-#define _LINUX_ATMPPP_H
-
-#include <linux/atm.h>
-
-#define PPPOATM_ENCAPS_AUTODETECT      (0)
-#define PPPOATM_ENCAPS_VC              (1)
-#define PPPOATM_ENCAPS_LLC             (2)
-
-/*
- * This is for the ATM_SETBACKEND call - these are like socket families:
- * the first element of the structure is the backend number and the rest
- * is per-backend specific
- */
-struct atm_backend_ppp {
-       atm_backend_t   backend_num;    /* ATM_BACKEND_PPP */
-       int             encaps;         /* PPPOATM_ENCAPS_* */
-};
-
-#endif /* _LINUX_ATMPPP_H */
diff --git a/include/linux/atmsap.h b/include/linux/atmsap.h
deleted file mode 100644 (file)
index 799b104..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-/* atmsap.h - ATM Service Access Point addressing definitions */
-
-/* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */
-
-
-#ifndef _LINUX_ATMSAP_H
-#define _LINUX_ATMSAP_H
-
-#include <linux/atmapi.h>
-
-/*
- * BEGIN_xx and END_xx markers are used for automatic generation of
- * documentation. Do not change them.
- */
-
-
-/*
- * Layer 2 protocol identifiers
- */
-
-/* BEGIN_L2 */
-#define ATM_L2_NONE    0       /* L2 not specified */
-#define ATM_L2_ISO1745  0x01   /* Basic mode ISO 1745 */
-#define ATM_L2_Q291    0x02    /* ITU-T Q.291 (Rec. I.441) */
-#define ATM_L2_X25_LL  0x06    /* ITU-T X.25, link layer */
-#define ATM_L2_X25_ML  0x07    /* ITU-T X.25, multilink */
-#define ATM_L2_LAPB    0x08    /* Extended LAPB, half-duplex (Rec. T.71) */
-#define ATM_L2_HDLC_ARM        0x09    /* HDLC ARM (ISO/IEC 4335) */
-#define ATM_L2_HDLC_NRM        0x0a    /* HDLC NRM (ISO/IEC 4335) */
-#define ATM_L2_HDLC_ABM        0x0b    /* HDLC ABM (ISO/IEC 4335) */
-#define ATM_L2_ISO8802 0x0c    /* LAN LLC (ISO/IEC 8802/2) */
-#define ATM_L2_X75     0x0d    /* ITU-T X.75, SLP */
-#define ATM_L2_Q922    0x0e    /* ITU-T Q.922 */
-#define ATM_L2_USER    0x10    /* user-specified */
-#define ATM_L2_ISO7776 0x11    /* ISO 7776 DTE-DTE */
-/* END_L2 */
-
-
-/*
- * Layer 3 protocol identifiers
- */
-
-/* BEGIN_L3 */
-#define ATM_L3_NONE    0       /* L3 not specified */
-#define ATM_L3_X25     0x06    /* ITU-T X.25, packet layer */
-#define ATM_L3_ISO8208 0x07    /* ISO/IEC 8208 */
-#define ATM_L3_X223    0x08    /* ITU-T X.223 | ISO/IEC 8878 */
-#define ATM_L3_ISO8473 0x09    /* ITU-T X.233 | ISO/IEC 8473 */
-#define ATM_L3_T70     0x0a    /* ITU-T T.70 minimum network layer */
-#define ATM_L3_TR9577  0x0b    /* ISO/IEC TR 9577 */
-#define ATM_L3_H310    0x0c    /* ITU-T Recommendation H.310 */
-#define ATM_L3_H321    0x0d    /* ITU-T Recommendation H.321 */
-#define ATM_L3_USER    0x10    /* user-specified */
-/* END_L3 */
-
-
-/*
- * High layer identifiers
- */
-
-/* BEGIN_HL */
-#define ATM_HL_NONE    0       /* HL not specified */
-#define ATM_HL_ISO     0x01    /* ISO */
-#define ATM_HL_USER    0x02    /* user-specific */
-#define ATM_HL_HLP     0x03    /* high layer profile - UNI 3.0 only */
-#define ATM_HL_VENDOR  0x04    /* vendor-specific application identifier */
-/* END_HL */
-
-
-/*
- * ITU-T coded mode of operation
- */
-
-/* BEGIN_IMD */
-#define ATM_IMD_NONE    0      /* mode not specified */
-#define ATM_IMD_NORMAL  1      /* normal mode of operation */
-#define ATM_IMD_EXTENDED 2     /* extended mode of operation */
-/* END_IMD */
-
-/*
- * H.310 code points
- */
-
-#define ATM_TT_NONE    0       /* terminal type not specified */
-#define ATM_TT_RX      1       /* receive only */
-#define ATM_TT_TX      2       /* send only */
-#define ATM_TT_RXTX    3       /* receive and send */
-
-#define ATM_MC_NONE    0       /* no multiplexing */
-#define ATM_MC_TS      1       /* transport stream (TS) */
-#define ATM_MC_TS_FEC  2       /* transport stream with forward error corr. */
-#define ATM_MC_PS      3       /* program stream (PS) */
-#define ATM_MC_PS_FEC  4       /* program stream with forward error corr. */
-#define ATM_MC_H221    5       /* ITU-T Rec. H.221 */
-
-/*
- * SAP structures
- */
-
-#define ATM_MAX_HLI    8       /* maximum high-layer information length */
-
-
-struct atm_blli {
-    unsigned char l2_proto;    /* layer 2 protocol */
-    union {
-       struct {
-           unsigned char mode; /* mode of operation (ATM_IMD_xxx), 0 if */
-                               /* absent */
-           unsigned char window; /* window size (k), 1-127 (0 to omit) */
-       } itu;                  /* ITU-T encoding */
-       unsigned char user;     /* user-specified l2 information */
-    } l2;
-    unsigned char l3_proto;    /* layer 3 protocol */
-    union {
-       struct {
-           unsigned char mode; /* mode of operation (ATM_IMD_xxx), 0 if */
-                               /* absent */
-           unsigned char def_size; /* default packet size (log2), 4-12 (0 to */
-                                   /* omit) */
-           unsigned char window;/* packet window size, 1-127 (0 to omit) */
-       } itu;                  /* ITU-T encoding */
-       unsigned char user;     /* user specified l3 information */
-       struct {                      /* if l3_proto = ATM_L3_H310 */
-           unsigned char term_type;  /* terminal type */
-           unsigned char fw_mpx_cap; /* forward multiplexing capability */
-                                     /* only if term_type != ATM_TT_NONE */
-           unsigned char bw_mpx_cap; /* backward multiplexing capability */
-                                     /* only if term_type != ATM_TT_NONE */
-       } h310;
-       struct {                  /* if l3_proto = ATM_L3_TR9577 */
-           unsigned char ipi;    /* initial protocol id */
-           unsigned char snap[5];/* IEEE 802.1 SNAP identifier */
-                                 /* (only if ipi == NLPID_IEEE802_1_SNAP) */
-       } tr9577;
-    } l3;
-} __ATM_API_ALIGN;
-
-
-struct atm_bhli {
-    unsigned char hl_type;     /* high layer information type */
-    unsigned char hl_length;   /* length (only if hl_type == ATM_HL_USER || */
-                               /* hl_type == ATM_HL_ISO) */
-    unsigned char hl_info[ATM_MAX_HLI];/* high layer information */
-};
-
-
-#define ATM_MAX_BLLI   3               /* maximum number of BLLI elements */
-
-
-struct atm_sap {
-       struct atm_bhli bhli;           /* local SAP, high-layer information */
-       struct atm_blli blli[ATM_MAX_BLLI] __ATM_API_ALIGN;
-                                       /* local SAP, low-layer info */
-};
-
-
-static __inline__ int blli_in_use(struct atm_blli blli)
-{
-       return blli.l2_proto || blli.l3_proto;
-}
-
-#endif
diff --git a/include/linux/atmsvc.h b/include/linux/atmsvc.h
deleted file mode 100644 (file)
index aa71583..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/* atmsvc.h - ATM signaling kernel-demon interface definitions */
-/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
-
-#ifndef _LINUX_ATMSVC_H
-#define _LINUX_ATMSVC_H
-
-#include <linux/atmapi.h>
-#include <linux/atm.h>
-#include <linux/atmioc.h>
-
-
-#define ATMSIGD_CTRL _IO('a',ATMIOC_SPECIAL)
-                               /* become ATM signaling demon control socket */
-
-enum atmsvc_msg_type { as_catch_null, as_bind, as_connect, as_accept, as_reject,
-                      as_listen, as_okay, as_error, as_indicate, as_close,
-                      as_itf_notify, as_modify, as_identify, as_terminate,
-                      as_addparty, as_dropparty };
-
-struct atmsvc_msg {
-       enum atmsvc_msg_type type;
-       atm_kptr_t vcc;
-       atm_kptr_t listen_vcc;          /* indicate */
-       int reply;                      /* for okay and close:             */
-                                       /*   < 0: error before active      */
-                                       /*        (sigd has discarded ctx) */
-                                       /*   ==0: success                  */
-                                       /*   > 0: error when active (still */
-                                       /*        need to close)           */
-       struct sockaddr_atmpvc pvc;     /* indicate, okay (connect) */
-       struct sockaddr_atmsvc local;   /* local SVC address */
-       struct atm_qos qos;             /* QOS parameters */
-       struct atm_sap sap;             /* SAP */
-       unsigned int session;           /* for p2pm */
-       struct sockaddr_atmsvc svc;     /* SVC address */
-} __ATM_API_ALIGN;
-
-/*
- * Message contents: see ftp://icaftp.epfl.ch/pub/linux/atm/docs/isp-*.tar.gz
- */
-
-/*
- * Some policy stuff for atmsigd and for net/atm/svc.c. Both have to agree on
- * what PCR is used to request bandwidth from the device driver. net/atm/svc.c
- * tries to do better than that, but only if there's no routing decision (i.e.
- * if signaling only uses one ATM interface).
- */
-
-#define SELECT_TOP_PCR(tp) ((tp).pcr ? (tp).pcr : \
-  (tp).max_pcr && (tp).max_pcr != ATM_MAX_PCR ? (tp).max_pcr : \
-  (tp).min_pcr ? (tp).min_pcr : ATM_MAX_PCR)
-
-#endif
index b889fa64b0e0933c73b41f09e0e1006fc0f86f7c..bce729afbcf9a5e184e70edc1bebf9f65a0176a3 100644 (file)
  * Written by Rickard E. (Rik) Faith <faith@redhat.com>
  *
  */
-
 #ifndef _LINUX_AUDIT_H_
 #define _LINUX_AUDIT_H_
 
-#include <linux/types.h>
-#include <linux/elf-em.h>
-#include <linux/ptrace.h>
-
-/* The netlink messages for the audit system is divided into blocks:
- * 1000 - 1099 are for commanding the audit system
- * 1100 - 1199 user space trusted application messages
- * 1200 - 1299 messages internal to the audit daemon
- * 1300 - 1399 audit event messages
- * 1400 - 1499 SE Linux use
- * 1500 - 1599 kernel LSPP events
- * 1600 - 1699 kernel crypto events
- * 1700 - 1799 kernel anomaly records
- * 1800 - 1899 kernel integrity events
- * 1900 - 1999 future kernel use
- * 2000 is for otherwise unclassified kernel audit messages (legacy)
- * 2001 - 2099 unused (kernel)
- * 2100 - 2199 user space anomaly records
- * 2200 - 2299 user space actions taken in response to anomalies
- * 2300 - 2399 user space generated LSPP events
- * 2400 - 2499 user space crypto events
- * 2500 - 2999 future user space (maybe integrity labels and related events)
- *
- * Messages from 1000-1199 are bi-directional. 1200-1299 & 2100 - 2999 are
- * exclusively user space. 1300-2099 is kernel --> user space 
- * communication.
- */
-#define AUDIT_GET              1000    /* Get status */
-#define AUDIT_SET              1001    /* Set status (enable/disable/auditd) */
-#define AUDIT_LIST             1002    /* List syscall rules -- deprecated */
-#define AUDIT_ADD              1003    /* Add syscall rule -- deprecated */
-#define AUDIT_DEL              1004    /* Delete syscall rule -- deprecated */
-#define AUDIT_USER             1005    /* Message from userspace -- deprecated */
-#define AUDIT_LOGIN            1006    /* Define the login id and information */
-#define AUDIT_WATCH_INS                1007    /* Insert file/dir watch entry */
-#define AUDIT_WATCH_REM                1008    /* Remove file/dir watch entry */
-#define AUDIT_WATCH_LIST       1009    /* List all file/dir watches */
-#define AUDIT_SIGNAL_INFO      1010    /* Get info about sender of signal to auditd */
-#define AUDIT_ADD_RULE         1011    /* Add syscall filtering rule */
-#define AUDIT_DEL_RULE         1012    /* Delete syscall filtering rule */
-#define AUDIT_LIST_RULES       1013    /* List syscall filtering rules */
-#define AUDIT_TRIM             1014    /* Trim junk from watched tree */
-#define AUDIT_MAKE_EQUIV       1015    /* Append to watched tree */
-#define AUDIT_TTY_GET          1016    /* Get TTY auditing status */
-#define AUDIT_TTY_SET          1017    /* Set TTY auditing status */
-
-#define AUDIT_FIRST_USER_MSG   1100    /* Userspace messages mostly uninteresting to kernel */
-#define AUDIT_USER_AVC         1107    /* We filter this differently */
-#define AUDIT_USER_TTY         1124    /* Non-ICANON TTY input meaning */
-#define AUDIT_LAST_USER_MSG    1199
-#define AUDIT_FIRST_USER_MSG2  2100    /* More user space messages */
-#define AUDIT_LAST_USER_MSG2   2999
-#define AUDIT_DAEMON_START      1200    /* Daemon startup record */
-#define AUDIT_DAEMON_END        1201    /* Daemon normal stop record */
-#define AUDIT_DAEMON_ABORT      1202    /* Daemon error stop record */
-#define AUDIT_DAEMON_CONFIG     1203    /* Daemon config change */
-
-#define AUDIT_SYSCALL          1300    /* Syscall event */
-/* #define AUDIT_FS_WATCH      1301     * Deprecated */
-#define AUDIT_PATH             1302    /* Filename path information */
-#define AUDIT_IPC              1303    /* IPC record */
-#define AUDIT_SOCKETCALL       1304    /* sys_socketcall arguments */
-#define AUDIT_CONFIG_CHANGE    1305    /* Audit system configuration change */
-#define AUDIT_SOCKADDR         1306    /* sockaddr copied as syscall arg */
-#define AUDIT_CWD              1307    /* Current working directory */
-#define AUDIT_EXECVE           1309    /* execve arguments */
-#define AUDIT_IPC_SET_PERM     1311    /* IPC new permissions record type */
-#define AUDIT_MQ_OPEN          1312    /* POSIX MQ open record type */
-#define AUDIT_MQ_SENDRECV      1313    /* POSIX MQ send/receive record type */
-#define AUDIT_MQ_NOTIFY                1314    /* POSIX MQ notify record type */
-#define AUDIT_MQ_GETSETATTR    1315    /* POSIX MQ get/set attribute record type */
-#define AUDIT_KERNEL_OTHER     1316    /* For use by 3rd party modules */
-#define AUDIT_FD_PAIR          1317    /* audit record for pipe/socketpair */
-#define AUDIT_OBJ_PID          1318    /* ptrace target */
-#define AUDIT_TTY              1319    /* Input on an administrative TTY */
-#define AUDIT_EOE              1320    /* End of multi-record event */
-#define AUDIT_BPRM_FCAPS       1321    /* Information about fcaps increasing perms */
-#define AUDIT_CAPSET           1322    /* Record showing argument to sys_capset */
-#define AUDIT_MMAP             1323    /* Record showing descriptor and flags in mmap */
-#define AUDIT_NETFILTER_PKT    1324    /* Packets traversing netfilter chains */
-#define AUDIT_NETFILTER_CFG    1325    /* Netfilter chain modifications */
-
-#define AUDIT_AVC              1400    /* SE Linux avc denial or grant */
-#define AUDIT_SELINUX_ERR      1401    /* Internal SE Linux Errors */
-#define AUDIT_AVC_PATH         1402    /* dentry, vfsmount pair from avc */
-#define AUDIT_MAC_POLICY_LOAD  1403    /* Policy file load */
-#define AUDIT_MAC_STATUS       1404    /* Changed enforcing,permissive,off */
-#define AUDIT_MAC_CONFIG_CHANGE        1405    /* Changes to booleans */
-#define AUDIT_MAC_UNLBL_ALLOW  1406    /* NetLabel: allow unlabeled traffic */
-#define AUDIT_MAC_CIPSOV4_ADD  1407    /* NetLabel: add CIPSOv4 DOI entry */
-#define AUDIT_MAC_CIPSOV4_DEL  1408    /* NetLabel: del CIPSOv4 DOI entry */
-#define AUDIT_MAC_MAP_ADD      1409    /* NetLabel: add LSM domain mapping */
-#define AUDIT_MAC_MAP_DEL      1410    /* NetLabel: del LSM domain mapping */
-#define AUDIT_MAC_IPSEC_ADDSA  1411    /* Not used */
-#define AUDIT_MAC_IPSEC_DELSA  1412    /* Not used  */
-#define AUDIT_MAC_IPSEC_ADDSPD 1413    /* Not used */
-#define AUDIT_MAC_IPSEC_DELSPD 1414    /* Not used */
-#define AUDIT_MAC_IPSEC_EVENT  1415    /* Audit an IPSec event */
-#define AUDIT_MAC_UNLBL_STCADD 1416    /* NetLabel: add a static label */
-#define AUDIT_MAC_UNLBL_STCDEL 1417    /* NetLabel: del a static label */
-
-#define AUDIT_FIRST_KERN_ANOM_MSG   1700
-#define AUDIT_LAST_KERN_ANOM_MSG    1799
-#define AUDIT_ANOM_PROMISCUOUS      1700 /* Device changed promiscuous mode */
-#define AUDIT_ANOM_ABEND            1701 /* Process ended abnormally */
-#define AUDIT_ANOM_LINK                    1702 /* Suspicious use of file links */
-#define AUDIT_INTEGRITY_DATA       1800 /* Data integrity verification */
-#define AUDIT_INTEGRITY_METADATA    1801 /* Metadata integrity verification */
-#define AUDIT_INTEGRITY_STATUS     1802 /* Integrity enable status */
-#define AUDIT_INTEGRITY_HASH       1803 /* Integrity HASH type */
-#define AUDIT_INTEGRITY_PCR        1804 /* PCR invalidation msgs */
-#define AUDIT_INTEGRITY_RULE       1805 /* policy rule */
-
-#define AUDIT_KERNEL           2000    /* Asynchronous audit record. NOT A REQUEST. */
-
-/* Rule flags */
-#define AUDIT_FILTER_USER      0x00    /* Apply rule to user-generated messages */
-#define AUDIT_FILTER_TASK      0x01    /* Apply rule at task creation (not syscall) */
-#define AUDIT_FILTER_ENTRY     0x02    /* Apply rule at syscall entry */
-#define AUDIT_FILTER_WATCH     0x03    /* Apply rule to file system watches */
-#define AUDIT_FILTER_EXIT      0x04    /* Apply rule at syscall exit */
-#define AUDIT_FILTER_TYPE      0x05    /* Apply rule at audit_log_start */
-
-#define AUDIT_NR_FILTERS       6
-
-#define AUDIT_FILTER_PREPEND   0x10    /* Prepend to front of list */
-
-/* Rule actions */
-#define AUDIT_NEVER    0       /* Do not build context if rule matches */
-#define AUDIT_POSSIBLE 1       /* Build context if rule matches  */
-#define AUDIT_ALWAYS   2       /* Generate audit record if rule matches */
-
-/* Rule structure sizes -- if these change, different AUDIT_ADD and
- * AUDIT_LIST commands must be implemented. */
-#define AUDIT_MAX_FIELDS   64
-#define AUDIT_MAX_KEY_LEN  256
-#define AUDIT_BITMASK_SIZE 64
-#define AUDIT_WORD(nr) ((__u32)((nr)/32))
-#define AUDIT_BIT(nr)  (1 << ((nr) - AUDIT_WORD(nr)*32))
-
-#define AUDIT_SYSCALL_CLASSES 16
-#define AUDIT_CLASS_DIR_WRITE 0
-#define AUDIT_CLASS_DIR_WRITE_32 1
-#define AUDIT_CLASS_CHATTR 2
-#define AUDIT_CLASS_CHATTR_32 3
-#define AUDIT_CLASS_READ 4
-#define AUDIT_CLASS_READ_32 5
-#define AUDIT_CLASS_WRITE 6
-#define AUDIT_CLASS_WRITE_32 7
-#define AUDIT_CLASS_SIGNAL 8
-#define AUDIT_CLASS_SIGNAL_32 9
-
-/* This bitmask is used to validate user input.  It represents all bits that
- * are currently used in an audit field constant understood by the kernel.
- * If you are adding a new #define AUDIT_<whatever>, please ensure that
- * AUDIT_UNUSED_BITS is updated if need be. */
-#define AUDIT_UNUSED_BITS      0x07FFFC00
-
-/* AUDIT_FIELD_COMPARE rule list */
-#define AUDIT_COMPARE_UID_TO_OBJ_UID   1
-#define AUDIT_COMPARE_GID_TO_OBJ_GID   2
-#define AUDIT_COMPARE_EUID_TO_OBJ_UID  3
-#define AUDIT_COMPARE_EGID_TO_OBJ_GID  4
-#define AUDIT_COMPARE_AUID_TO_OBJ_UID  5
-#define AUDIT_COMPARE_SUID_TO_OBJ_UID  6
-#define AUDIT_COMPARE_SGID_TO_OBJ_GID  7
-#define AUDIT_COMPARE_FSUID_TO_OBJ_UID 8
-#define AUDIT_COMPARE_FSGID_TO_OBJ_GID 9
-
-#define AUDIT_COMPARE_UID_TO_AUID      10
-#define AUDIT_COMPARE_UID_TO_EUID      11
-#define AUDIT_COMPARE_UID_TO_FSUID     12
-#define AUDIT_COMPARE_UID_TO_SUID      13
-
-#define AUDIT_COMPARE_AUID_TO_FSUID    14
-#define AUDIT_COMPARE_AUID_TO_SUID     15
-#define AUDIT_COMPARE_AUID_TO_EUID     16
-
-#define AUDIT_COMPARE_EUID_TO_SUID     17
-#define AUDIT_COMPARE_EUID_TO_FSUID    18
-
-#define AUDIT_COMPARE_SUID_TO_FSUID    19
-
-#define AUDIT_COMPARE_GID_TO_EGID      20
-#define AUDIT_COMPARE_GID_TO_FSGID     21
-#define AUDIT_COMPARE_GID_TO_SGID      22
-
-#define AUDIT_COMPARE_EGID_TO_FSGID    23
-#define AUDIT_COMPARE_EGID_TO_SGID     24
-#define AUDIT_COMPARE_SGID_TO_FSGID    25
-
-#define AUDIT_MAX_FIELD_COMPARE                AUDIT_COMPARE_SGID_TO_FSGID
-
-/* Rule fields */
-                               /* These are useful when checking the
-                                * task structure at task creation time
-                                * (AUDIT_PER_TASK).  */
-#define AUDIT_PID      0
-#define AUDIT_UID      1
-#define AUDIT_EUID     2
-#define AUDIT_SUID     3
-#define AUDIT_FSUID    4
-#define AUDIT_GID      5
-#define AUDIT_EGID     6
-#define AUDIT_SGID     7
-#define AUDIT_FSGID    8
-#define AUDIT_LOGINUID 9
-#define AUDIT_PERS     10
-#define AUDIT_ARCH     11
-#define AUDIT_MSGTYPE  12
-#define AUDIT_SUBJ_USER        13      /* security label user */
-#define AUDIT_SUBJ_ROLE        14      /* security label role */
-#define AUDIT_SUBJ_TYPE        15      /* security label type */
-#define AUDIT_SUBJ_SEN 16      /* security label sensitivity label */
-#define AUDIT_SUBJ_CLR 17      /* security label clearance label */
-#define AUDIT_PPID     18
-#define AUDIT_OBJ_USER 19
-#define AUDIT_OBJ_ROLE 20
-#define AUDIT_OBJ_TYPE 21
-#define AUDIT_OBJ_LEV_LOW      22
-#define AUDIT_OBJ_LEV_HIGH     23
-
-                               /* These are ONLY useful when checking
-                                * at syscall exit time (AUDIT_AT_EXIT). */
-#define AUDIT_DEVMAJOR 100
-#define AUDIT_DEVMINOR 101
-#define AUDIT_INODE    102
-#define AUDIT_EXIT     103
-#define AUDIT_SUCCESS   104    /* exit >= 0; value ignored */
-#define AUDIT_WATCH    105
-#define AUDIT_PERM     106
-#define AUDIT_DIR      107
-#define AUDIT_FILETYPE 108
-#define AUDIT_OBJ_UID  109
-#define AUDIT_OBJ_GID  110
-#define AUDIT_FIELD_COMPARE    111
-
-#define AUDIT_ARG0      200
-#define AUDIT_ARG1      (AUDIT_ARG0+1)
-#define AUDIT_ARG2      (AUDIT_ARG0+2)
-#define AUDIT_ARG3      (AUDIT_ARG0+3)
-
-#define AUDIT_FILTERKEY        210
-
-#define AUDIT_NEGATE                   0x80000000
-
-/* These are the supported operators.
- *     4  2  1  8
- *     =  >  <  ?
- *     ----------
- *     0  0  0  0      00      nonsense
- *     0  0  0  1      08      &  bit mask
- *     0  0  1  0      10      <
- *     0  1  0  0      20      >
- *     0  1  1  0      30      !=
- *     1  0  0  0      40      =
- *     1  0  0  1      48      &=  bit test
- *     1  0  1  0      50      <=
- *     1  1  0  0      60      >=
- *     1  1  1  1      78      all operators
- */
-#define AUDIT_BIT_MASK                 0x08000000
-#define AUDIT_LESS_THAN                        0x10000000
-#define AUDIT_GREATER_THAN             0x20000000
-#define AUDIT_NOT_EQUAL                        0x30000000
-#define AUDIT_EQUAL                    0x40000000
-#define AUDIT_BIT_TEST                 (AUDIT_BIT_MASK|AUDIT_EQUAL)
-#define AUDIT_LESS_THAN_OR_EQUAL       (AUDIT_LESS_THAN|AUDIT_EQUAL)
-#define AUDIT_GREATER_THAN_OR_EQUAL    (AUDIT_GREATER_THAN|AUDIT_EQUAL)
-#define AUDIT_OPERATORS                        (AUDIT_EQUAL|AUDIT_NOT_EQUAL|AUDIT_BIT_MASK)
-
-enum {
-       Audit_equal,
-       Audit_not_equal,
-       Audit_bitmask,
-       Audit_bittest,
-       Audit_lt,
-       Audit_gt,
-       Audit_le,
-       Audit_ge,
-       Audit_bad
-};
-
-/* Status symbols */
-                               /* Mask values */
-#define AUDIT_STATUS_ENABLED           0x0001
-#define AUDIT_STATUS_FAILURE           0x0002
-#define AUDIT_STATUS_PID               0x0004
-#define AUDIT_STATUS_RATE_LIMIT                0x0008
-#define AUDIT_STATUS_BACKLOG_LIMIT     0x0010
-                               /* Failure-to-log actions */
-#define AUDIT_FAIL_SILENT      0
-#define AUDIT_FAIL_PRINTK      1
-#define AUDIT_FAIL_PANIC       2
-
-/* distinguish syscall tables */
-#define __AUDIT_ARCH_64BIT 0x80000000
-#define __AUDIT_ARCH_LE           0x40000000
-#define AUDIT_ARCH_ALPHA       (EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_ARM         (EM_ARM|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_ARMEB       (EM_ARM)
-#define AUDIT_ARCH_CRIS                (EM_CRIS|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_FRV         (EM_FRV)
-#define AUDIT_ARCH_H8300       (EM_H8_300)
-#define AUDIT_ARCH_I386                (EM_386|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_IA64                (EM_IA_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_M32R                (EM_M32R)
-#define AUDIT_ARCH_M68K                (EM_68K)
-#define AUDIT_ARCH_MIPS                (EM_MIPS)
-#define AUDIT_ARCH_MIPSEL      (EM_MIPS|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_MIPS64      (EM_MIPS|__AUDIT_ARCH_64BIT)
-#define AUDIT_ARCH_MIPSEL64    (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_OPENRISC    (EM_OPENRISC)
-#define AUDIT_ARCH_PARISC      (EM_PARISC)
-#define AUDIT_ARCH_PARISC64    (EM_PARISC|__AUDIT_ARCH_64BIT)
-#define AUDIT_ARCH_PPC         (EM_PPC)
-#define AUDIT_ARCH_PPC64       (EM_PPC64|__AUDIT_ARCH_64BIT)
-#define AUDIT_ARCH_S390                (EM_S390)
-#define AUDIT_ARCH_S390X       (EM_S390|__AUDIT_ARCH_64BIT)
-#define AUDIT_ARCH_SH          (EM_SH)
-#define AUDIT_ARCH_SHEL                (EM_SH|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_SH64                (EM_SH|__AUDIT_ARCH_64BIT)
-#define AUDIT_ARCH_SHEL64      (EM_SH|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
-#define AUDIT_ARCH_SPARC       (EM_SPARC)
-#define AUDIT_ARCH_SPARC64     (EM_SPARCV9|__AUDIT_ARCH_64BIT)
-#define AUDIT_ARCH_X86_64      (EM_X86_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
-
-#define AUDIT_PERM_EXEC                1
-#define AUDIT_PERM_WRITE       2
-#define AUDIT_PERM_READ                4
-#define AUDIT_PERM_ATTR                8
-
-struct audit_status {
-       __u32           mask;           /* Bit mask for valid entries */
-       __u32           enabled;        /* 1 = enabled, 0 = disabled */
-       __u32           failure;        /* Failure-to-log action */
-       __u32           pid;            /* pid of auditd process */
-       __u32           rate_limit;     /* messages rate limit (per second) */
-       __u32           backlog_limit;  /* waiting messages limit */
-       __u32           lost;           /* messages lost */
-       __u32           backlog;        /* messages waiting in queue */
-};
-
-struct audit_tty_status {
-       __u32           enabled; /* 1 = enabled, 0 = disabled */
-};
-
-/* audit_rule_data supports filter rules with both integer and string
- * fields.  It corresponds with AUDIT_ADD_RULE, AUDIT_DEL_RULE and
- * AUDIT_LIST_RULES requests.
- */
-struct audit_rule_data {
-       __u32           flags;  /* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */
-       __u32           action; /* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */
-       __u32           field_count;
-       __u32           mask[AUDIT_BITMASK_SIZE]; /* syscall(s) affected */
-       __u32           fields[AUDIT_MAX_FIELDS];
-       __u32           values[AUDIT_MAX_FIELDS];
-       __u32           fieldflags[AUDIT_MAX_FIELDS];
-       __u32           buflen; /* total length of string fields */
-       char            buf[0]; /* string fields buffer */
-};
-
-/* audit_rule is supported to maintain backward compatibility with
- * userspace.  It supports integer fields only and corresponds to
- * AUDIT_ADD, AUDIT_DEL and AUDIT_LIST requests.
- */
-struct audit_rule {            /* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */
-       __u32           flags;  /* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */
-       __u32           action; /* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */
-       __u32           field_count;
-       __u32           mask[AUDIT_BITMASK_SIZE];
-       __u32           fields[AUDIT_MAX_FIELDS];
-       __u32           values[AUDIT_MAX_FIELDS];
-};
-
-#ifdef __KERNEL__
 #include <linux/sched.h>
+#include <uapi/linux/audit.h>
 
 struct audit_sig_info {
        uid_t           uid;
@@ -860,4 +482,3 @@ static inline void audit_log_string(struct audit_buffer *ab, const char *buf)
 }
 
 #endif
-#endif
index da64e15004b642b97d2d31da90231115fd2332ef..fcd704d354c4c345d0c91aa4ebcb2f811b3851fa 100644 (file)
  *
  * ----------------------------------------------------------------------- */
 
-
 #ifndef _LINUX_AUTO_FS_H
 #define _LINUX_AUTO_FS_H
 
-#include <linux/types.h>
-#ifdef __KERNEL__
 #include <linux/fs.h>
 #include <linux/limits.h>
 #include <linux/ioctl.h>
-#else
-#include <sys/ioctl.h>
-#endif /* __KERNEL__ */
-
-/* This file describes autofs v3 */
-#define AUTOFS_PROTO_VERSION   3
-
-/* Range of protocol versions defined */
-#define AUTOFS_MAX_PROTO_VERSION       AUTOFS_PROTO_VERSION
-#define AUTOFS_MIN_PROTO_VERSION       AUTOFS_PROTO_VERSION
-
-/*
- * Architectures where both 32- and 64-bit binaries can be executed
- * on 64-bit kernels need this.  This keeps the structure format
- * uniform, and makes sure the wait_queue_token isn't too big to be
- * passed back down to the kernel.
- *
- * This assumes that on these architectures:
- * mode     32 bit    64 bit
- * -------------------------
- * int      32 bit    32 bit
- * long     32 bit    64 bit
- *
- * If so, 32-bit user-space code should be backwards compatible.
- */
-
-#if defined(__sparc__) || defined(__mips__) || defined(__x86_64__) \
- || defined(__powerpc__) || defined(__s390__)
-typedef unsigned int autofs_wqt_t;
-#else
-typedef unsigned long autofs_wqt_t;
-#endif
-
-/* Packet types */
-#define autofs_ptype_missing   0       /* Missing entry (mount request) */
-#define autofs_ptype_expire    1       /* Expire entry (umount request) */
-
-struct autofs_packet_hdr {
-       int proto_version;              /* Protocol version */
-       int type;                       /* Type of packet */
-};
-
-struct autofs_packet_missing {
-       struct autofs_packet_hdr hdr;
-        autofs_wqt_t wait_queue_token;
-       int len;
-       char name[NAME_MAX+1];
-};     
-
-/* v3 expire (via ioctl) */
-struct autofs_packet_expire {
-       struct autofs_packet_hdr hdr;
-       int len;
-       char name[NAME_MAX+1];
-};
-
-#define AUTOFS_IOC_READY      _IO(0x93,0x60)
-#define AUTOFS_IOC_FAIL       _IO(0x93,0x61)
-#define AUTOFS_IOC_CATATONIC  _IO(0x93,0x62)
-#define AUTOFS_IOC_PROTOVER   _IOR(0x93,0x63,int)
-#define AUTOFS_IOC_SETTIMEOUT32 _IOWR(0x93,0x64,compat_ulong_t)
-#define AUTOFS_IOC_SETTIMEOUT _IOWR(0x93,0x64,unsigned long)
-#define AUTOFS_IOC_EXPIRE     _IOR(0x93,0x65,struct autofs_packet_expire)
-
+#include <uapi/linux/auto_fs.h>
 #endif /* _LINUX_AUTO_FS_H */
diff --git a/include/linux/auto_fs4.h b/include/linux/auto_fs4.h
deleted file mode 100644 (file)
index e02982f..0000000
+++ /dev/null
@@ -1,164 +0,0 @@
-/* -*- c -*-
- * linux/include/linux/auto_fs4.h
- *
- * Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org>
- *
- * This file is part of the Linux kernel and is made available under
- * the terms of the GNU General Public License, version 2, or at your
- * option, any later version, incorporated herein by reference.
- */
-
-#ifndef _LINUX_AUTO_FS4_H
-#define _LINUX_AUTO_FS4_H
-
-/* Include common v3 definitions */
-#include <linux/types.h>
-#include <linux/auto_fs.h>
-
-/* autofs v4 definitions */
-#undef AUTOFS_PROTO_VERSION
-#undef AUTOFS_MIN_PROTO_VERSION
-#undef AUTOFS_MAX_PROTO_VERSION
-
-#define AUTOFS_PROTO_VERSION           5
-#define AUTOFS_MIN_PROTO_VERSION       3
-#define AUTOFS_MAX_PROTO_VERSION       5
-
-#define AUTOFS_PROTO_SUBVERSION                2
-
-/* Mask for expire behaviour */
-#define AUTOFS_EXP_IMMEDIATE           1
-#define AUTOFS_EXP_LEAVES              2
-
-#define AUTOFS_TYPE_ANY                        0U
-#define AUTOFS_TYPE_INDIRECT           1U
-#define AUTOFS_TYPE_DIRECT             2U
-#define AUTOFS_TYPE_OFFSET             4U
-
-static inline void set_autofs_type_indirect(unsigned int *type)
-{
-       *type = AUTOFS_TYPE_INDIRECT;
-       return;
-}
-
-static inline unsigned int autofs_type_indirect(unsigned int type)
-{
-       return (type == AUTOFS_TYPE_INDIRECT);
-}
-
-static inline void set_autofs_type_direct(unsigned int *type)
-{
-       *type = AUTOFS_TYPE_DIRECT;
-       return;
-}
-
-static inline unsigned int autofs_type_direct(unsigned int type)
-{
-       return (type == AUTOFS_TYPE_DIRECT);
-}
-
-static inline void set_autofs_type_offset(unsigned int *type)
-{
-       *type = AUTOFS_TYPE_OFFSET;
-       return;
-}
-
-static inline unsigned int autofs_type_offset(unsigned int type)
-{
-       return (type == AUTOFS_TYPE_OFFSET);
-}
-
-static inline unsigned int autofs_type_trigger(unsigned int type)
-{
-       return (type == AUTOFS_TYPE_DIRECT || type == AUTOFS_TYPE_OFFSET);
-}
-
-/*
- * This isn't really a type as we use it to say "no type set" to
- * indicate we want to search for "any" mount in the
- * autofs_dev_ioctl_ismountpoint() device ioctl function.
- */
-static inline void set_autofs_type_any(unsigned int *type)
-{
-       *type = AUTOFS_TYPE_ANY;
-       return;
-}
-
-static inline unsigned int autofs_type_any(unsigned int type)
-{
-       return (type == AUTOFS_TYPE_ANY);
-}
-
-/* Daemon notification packet types */
-enum autofs_notify {
-       NFY_NONE,
-       NFY_MOUNT,
-       NFY_EXPIRE
-};
-
-/* Kernel protocol version 4 packet types */
-
-/* Expire entry (umount request) */
-#define autofs_ptype_expire_multi      2
-
-/* Kernel protocol version 5 packet types */
-
-/* Indirect mount missing and expire requests. */
-#define autofs_ptype_missing_indirect  3
-#define autofs_ptype_expire_indirect   4
-
-/* Direct mount missing and expire requests */
-#define autofs_ptype_missing_direct    5
-#define autofs_ptype_expire_direct     6
-
-/* v4 multi expire (via pipe) */
-struct autofs_packet_expire_multi {
-       struct autofs_packet_hdr hdr;
-        autofs_wqt_t wait_queue_token;
-       int len;
-       char name[NAME_MAX+1];
-};
-
-union autofs_packet_union {
-       struct autofs_packet_hdr hdr;
-       struct autofs_packet_missing missing;
-       struct autofs_packet_expire expire;
-       struct autofs_packet_expire_multi expire_multi;
-};
-
-/* autofs v5 common packet struct */
-struct autofs_v5_packet {
-       struct autofs_packet_hdr hdr;
-       autofs_wqt_t wait_queue_token;
-       __u32 dev;
-       __u64 ino;
-       __u32 uid;
-       __u32 gid;
-       __u32 pid;
-       __u32 tgid;
-       __u32 len;
-       char name[NAME_MAX+1];
-};
-
-typedef struct autofs_v5_packet autofs_packet_missing_indirect_t;
-typedef struct autofs_v5_packet autofs_packet_expire_indirect_t;
-typedef struct autofs_v5_packet autofs_packet_missing_direct_t;
-typedef struct autofs_v5_packet autofs_packet_expire_direct_t;
-
-union autofs_v5_packet_union {
-       struct autofs_packet_hdr hdr;
-       struct autofs_v5_packet v5_packet;
-       autofs_packet_missing_indirect_t missing_indirect;
-       autofs_packet_expire_indirect_t expire_indirect;
-       autofs_packet_missing_direct_t missing_direct;
-       autofs_packet_expire_direct_t expire_direct;
-};
-
-#define AUTOFS_IOC_EXPIRE_MULTI                _IOW(0x93,0x66,int)
-#define AUTOFS_IOC_EXPIRE_INDIRECT     AUTOFS_IOC_EXPIRE_MULTI
-#define AUTOFS_IOC_EXPIRE_DIRECT       AUTOFS_IOC_EXPIRE_MULTI
-#define AUTOFS_IOC_PROTOSUBVER         _IOR(0x93,0x67,int)
-#define AUTOFS_IOC_ASKUMOUNT           _IOR(0x93,0x70,int)
-
-
-#endif /* _LINUX_AUTO_FS4_H */
index f3b5d4e3a2ac43eb1b529802122cb38c7898827b..669fef5c745a3fe98145a87d21a588cb64835c15 100644 (file)
@@ -1,39 +1,8 @@
 #ifndef _LINUX_AUXVEC_H
 #define _LINUX_AUXVEC_H
 
-#include <asm/auxvec.h>
+#include <uapi/linux/auxvec.h>
 
-/* Symbolic values for the entries in the auxiliary table
-   put on the initial stack */
-#define AT_NULL   0    /* end of vector */
-#define AT_IGNORE 1    /* entry should be ignored */
-#define AT_EXECFD 2    /* file descriptor of program */
-#define AT_PHDR   3    /* program headers for program */
-#define AT_PHENT  4    /* size of program header entry */
-#define AT_PHNUM  5    /* number of program headers */
-#define AT_PAGESZ 6    /* system page size */
-#define AT_BASE   7    /* base address of interpreter */
-#define AT_FLAGS  8    /* flags */
-#define AT_ENTRY  9    /* entry point of program */
-#define AT_NOTELF 10   /* program is not ELF */
-#define AT_UID    11   /* real uid */
-#define AT_EUID   12   /* effective uid */
-#define AT_GID    13   /* real gid */
-#define AT_EGID   14   /* effective gid */
-#define AT_PLATFORM 15  /* string identifying CPU for optimizations */
-#define AT_HWCAP  16    /* arch dependent hints at CPU capabilities */
-#define AT_CLKTCK 17   /* frequency at which times() increments */
-/* AT_* values 18 through 22 are reserved */
-#define AT_SECURE 23   /* secure mode boolean */
-#define AT_BASE_PLATFORM 24    /* string identifying real platform, may
-                                * differ from AT_PLATFORM. */
-#define AT_RANDOM 25   /* address of 16 random bytes */
-
-#define AT_EXECFN  31  /* filename of program */
-
-#ifdef __KERNEL__
 #define AT_VECTOR_SIZE_BASE 19 /* NEW_AUX_ENT entries in auxiliary table */
   /* number of "#define AT_.*" above, minus {AT_NULL, AT_IGNORE, AT_NOTELF} */
-#endif
-
 #endif /* _LINUX_AUXVEC_H */
diff --git a/include/linux/ax25.h b/include/linux/ax25.h
deleted file mode 100644 (file)
index 74c89a4..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * These are the public elements of the Linux kernel AX.25 code. A similar
- * file netrom.h exists for the NET/ROM protocol.
- */
-
-#ifndef        AX25_KERNEL_H
-#define        AX25_KERNEL_H
-
-#include <linux/socket.h>
-
-#define AX25_MTU       256
-#define AX25_MAX_DIGIS  8
-
-#define AX25_WINDOW    1
-#define AX25_T1                2
-#define AX25_N2                3
-#define AX25_T3                4
-#define AX25_T2                5
-#define        AX25_BACKOFF    6
-#define        AX25_EXTSEQ     7
-#define        AX25_PIDINCL    8
-#define AX25_IDLE      9
-#define AX25_PACLEN    10
-#define AX25_IAMDIGI   12
-
-#define AX25_KILL      99
-
-#define SIOCAX25GETUID         (SIOCPROTOPRIVATE+0)
-#define SIOCAX25ADDUID         (SIOCPROTOPRIVATE+1)
-#define SIOCAX25DELUID         (SIOCPROTOPRIVATE+2)
-#define SIOCAX25NOUID          (SIOCPROTOPRIVATE+3)
-#define SIOCAX25OPTRT          (SIOCPROTOPRIVATE+7)
-#define SIOCAX25CTLCON         (SIOCPROTOPRIVATE+8)
-#define SIOCAX25GETINFOOLD     (SIOCPROTOPRIVATE+9)
-#define SIOCAX25ADDFWD         (SIOCPROTOPRIVATE+10)
-#define SIOCAX25DELFWD         (SIOCPROTOPRIVATE+11)
-#define SIOCAX25DEVCTL          (SIOCPROTOPRIVATE+12)
-#define SIOCAX25GETINFO         (SIOCPROTOPRIVATE+13)
-
-#define AX25_SET_RT_IPMODE     2
-
-#define AX25_NOUID_DEFAULT     0
-#define AX25_NOUID_BLOCK       1
-
-typedef struct {
-       char            ax25_call[7];   /* 6 call + SSID (shifted ascii!) */
-} ax25_address;
-
-struct sockaddr_ax25 {
-       __kernel_sa_family_t sax25_family;
-       ax25_address    sax25_call;
-       int             sax25_ndigis;
-       /* Digipeater ax25_address sets follow */
-};
-
-#define sax25_uid      sax25_ndigis
-
-struct full_sockaddr_ax25 {
-       struct sockaddr_ax25 fsa_ax25;
-       ax25_address    fsa_digipeater[AX25_MAX_DIGIS];
-};
-
-struct ax25_routes_struct {
-       ax25_address    port_addr;
-       ax25_address    dest_addr;
-       unsigned char   digi_count;
-       ax25_address    digi_addr[AX25_MAX_DIGIS];
-};
-
-struct ax25_route_opt_struct {
-       ax25_address    port_addr;
-       ax25_address    dest_addr;
-       int             cmd;
-       int             arg;
-};
-
-struct ax25_ctl_struct {
-        ax25_address            port_addr;
-        ax25_address            source_addr;
-        ax25_address            dest_addr;
-        unsigned int            cmd;
-        unsigned long           arg;
-        unsigned char           digi_count;
-        ax25_address            digi_addr[AX25_MAX_DIGIS];
-};
-
-/* this will go away. Please do not export to user land */
-struct ax25_info_struct_deprecated {
-       unsigned int    n2, n2count;
-       unsigned int    t1, t1timer;
-       unsigned int    t2, t2timer;
-       unsigned int    t3, t3timer;
-       unsigned int    idle, idletimer;
-       unsigned int    state;
-       unsigned int    rcv_q, snd_q;
-};
-
-struct ax25_info_struct {
-       unsigned int    n2, n2count;
-       unsigned int    t1, t1timer;
-       unsigned int    t2, t2timer;
-       unsigned int    t3, t3timer;
-       unsigned int    idle, idletimer;
-       unsigned int    state;
-       unsigned int    rcv_q, snd_q;
-       unsigned int    vs, vr, va, vs_max;
-       unsigned int    paclen;
-       unsigned int    window;
-};
-
-struct ax25_fwd_struct {
-       ax25_address    port_from;
-       ax25_address    port_to;
-};
-
-#endif
diff --git a/include/linux/b1lli.h b/include/linux/b1lli.h
deleted file mode 100644 (file)
index 713f712..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/* $Id: b1lli.h,v 1.8.8.3 2001/09/23 22:25:05 kai Exp $
- *
- * ISDN lowlevel-module for AVM B1-card.
- *
- * Copyright 1996 by Carsten Paeth (calle@calle.in-berlin.de)
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-
-#ifndef _B1LLI_H_
-#define _B1LLI_H_
-/*
- * struct for loading t4 file 
- */
-typedef struct avmb1_t4file {
-       int len;
-       unsigned char *data;
-} avmb1_t4file;
-
-typedef struct avmb1_loaddef {
-       int contr;
-       avmb1_t4file t4file;
-} avmb1_loaddef;
-
-typedef struct avmb1_loadandconfigdef {
-       int contr;
-       avmb1_t4file t4file;
-        avmb1_t4file t4config; 
-} avmb1_loadandconfigdef;
-
-typedef struct avmb1_resetdef {
-       int contr;
-} avmb1_resetdef;
-
-typedef struct avmb1_getdef {
-       int contr;
-       int cardtype;
-       int cardstate;
-} avmb1_getdef;
-
-/*
- * struct for adding new cards 
- */
-typedef struct avmb1_carddef {
-       int port;
-       int irq;
-} avmb1_carddef;
-
-#define AVM_CARDTYPE_B1                0
-#define AVM_CARDTYPE_T1                1
-#define AVM_CARDTYPE_M1                2
-#define AVM_CARDTYPE_M2                3
-
-typedef struct avmb1_extcarddef {
-       int port;
-       int irq;
-        int cardtype;
-        int cardnr;  /* for HEMA/T1 */
-} avmb1_extcarddef;
-
-#define        AVMB1_LOAD              0       /* load image to card */
-#define AVMB1_ADDCARD          1       /* add a new card - OBSOLETE */
-#define AVMB1_RESETCARD                2       /* reset a card */
-#define        AVMB1_LOAD_AND_CONFIG   3       /* load image and config to card */
-#define        AVMB1_ADDCARD_WITH_TYPE 4       /* add a new card, with cardtype */
-#define AVMB1_GET_CARDINFO     5       /* get cardtype */
-#define AVMB1_REMOVECARD       6       /* remove a card - OBSOLETE */
-
-#define        AVMB1_REGISTERCARD_IS_OBSOLETE
-
-#endif                         /* _B1LLI_H_ */
diff --git a/include/linux/baycom.h b/include/linux/baycom.h
deleted file mode 100644 (file)
index 81249e0..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * The Linux BAYCOM driver for the Baycom serial 1200 baud modem
- * and the parallel 9600 baud modem
- * (C) 1997-1998 by Thomas Sailer, HB9JNX/AE4WA
- */
-
-#ifndef _BAYCOM_H
-#define _BAYCOM_H
-
-/* -------------------------------------------------------------------- */
-/*
- * structs for the IOCTL commands
- */
-
-struct baycom_debug_data {
-       unsigned long debug1;
-       unsigned long debug2;
-       long debug3;
-};
-
-struct baycom_ioctl {
-       int cmd;
-       union {
-               struct baycom_debug_data dbg;
-       } data;
-};
-
-/* -------------------------------------------------------------------- */
-
-/*
- * ioctl values change for baycom
- */
-#define BAYCOMCTL_GETDEBUG       0x92
-
-/* -------------------------------------------------------------------- */
-
-#endif /* _BAYCOM_H */
-
-/* --------------------------------------------------------------------- */
diff --git a/include/linux/bfs_fs.h b/include/linux/bfs_fs.h
deleted file mode 100644 (file)
index 1c0b355..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *     include/linux/bfs_fs.h - BFS data structures on disk.
- *     Copyright (C) 1999 Tigran Aivazian <tigran@veritas.com>
- */
-
-#ifndef _LINUX_BFS_FS_H
-#define _LINUX_BFS_FS_H
-
-#include <linux/types.h>
-
-#define BFS_BSIZE_BITS         9
-#define BFS_BSIZE              (1<<BFS_BSIZE_BITS)
-
-#define BFS_MAGIC              0x1BADFACE
-#define BFS_ROOT_INO           2
-#define BFS_INODES_PER_BLOCK   8
-
-/* SVR4 vnode type values (bfs_inode->i_vtype) */
-#define BFS_VDIR 2L
-#define BFS_VREG 1L
-
-/* BFS inode layout on disk */
-struct bfs_inode {
-       __le16 i_ino;
-       __u16 i_unused;
-       __le32 i_sblock;
-       __le32 i_eblock;
-       __le32 i_eoffset;
-       __le32 i_vtype;
-       __le32 i_mode;
-       __le32 i_uid;
-       __le32 i_gid;
-       __le32 i_nlink;
-       __le32 i_atime;
-       __le32 i_mtime;
-       __le32 i_ctime;
-       __u32 i_padding[4];
-};
-
-#define BFS_NAMELEN            14      
-#define BFS_DIRENT_SIZE                16
-#define BFS_DIRS_PER_BLOCK     32
-
-struct bfs_dirent {
-       __le16 ino;
-       char name[BFS_NAMELEN];
-};
-
-/* BFS superblock layout on disk */
-struct bfs_super_block {
-       __le32 s_magic;
-       __le32 s_start;
-       __le32 s_end;
-       __le32 s_from;
-       __le32 s_to;
-       __s32 s_bfrom;
-       __s32 s_bto;
-       char  s_fsname[6];
-       char  s_volume[6];
-       __u32 s_padding[118];
-};
-
-
-#define BFS_OFF2INO(offset) \
-        ((((offset) - BFS_BSIZE) / sizeof(struct bfs_inode)) + BFS_ROOT_INO)
-
-#define BFS_INO2OFF(ino) \
-       ((__u32)(((ino) - BFS_ROOT_INO) * sizeof(struct bfs_inode)) + BFS_BSIZE)
-#define BFS_NZFILESIZE(ip) \
-        ((le32_to_cpu((ip)->i_eoffset) + 1) -  le32_to_cpu((ip)->i_sblock) * BFS_BSIZE)
-
-#define BFS_FILESIZE(ip) \
-        ((ip)->i_sblock == 0 ? 0 : BFS_NZFILESIZE(ip))
-
-#define BFS_FILEBLOCKS(ip) \
-        ((ip)->i_sblock == 0 ? 0 : (le32_to_cpu((ip)->i_eblock) + 1) -  le32_to_cpu((ip)->i_sblock))
-#define BFS_UNCLEAN(bfs_sb, sb)        \
-       ((le32_to_cpu(bfs_sb->s_from) != -1) && (le32_to_cpu(bfs_sb->s_to) != -1) && !(sb->s_flags & MS_RDONLY))
-
-
-#endif /* _LINUX_BFS_FS_H */
index 26531f32bbb2d29793979c1c240642f9463073e5..cfcc6bfcaec062f30d7c9eff3f4297a7fc042f33 100644 (file)
@@ -1,26 +1,10 @@
 #ifndef _LINUX_BINFMTS_H
 #define _LINUX_BINFMTS_H
 
-#include <linux/capability.h>
-
-struct pt_regs;
-
-/*
- * These are the maximum length and maximum number of strings passed to the
- * execve() system call.  MAX_ARG_STRLEN is essentially random but serves to
- * prevent the kernel from being unduly impacted by misaddressed pointers.
- * MAX_ARG_STRINGS is chosen to fit in a signed 32-bit integer.
- */
-#define MAX_ARG_STRLEN (PAGE_SIZE * 32)
-#define MAX_ARG_STRINGS 0x7FFFFFFF
-
-/* sizeof(linux_binprm->buf) */
-#define BINPRM_BUF_SIZE 128
-
-#ifdef __KERNEL__
 #include <linux/sched.h>
 #include <linux/unistd.h>
 #include <asm/exec.h>
+#include <uapi/linux/binfmts.h>
 
 #define CORENAME_MAX_SIZE 128
 
@@ -141,5 +125,4 @@ extern void free_bprm(struct linux_binprm *);
 extern void ret_from_kernel_execve(struct pt_regs *normal) __noreturn;
 #endif
 
-#endif /* __KERNEL__ */
 #endif /* _LINUX_BINFMTS_H */
diff --git a/include/linux/blkpg.h b/include/linux/blkpg.h
deleted file mode 100644 (file)
index a851944..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef _LINUX_BLKPG_H
-#define _LINUX_BLKPG_H
-
-/*
- * Partition table and disk geometry handling
- *
- * A single ioctl with lots of subfunctions:
- *
- * Device number stuff:
- *    get_whole_disk()         (given the device number of a partition,
- *                               find the device number of the encompassing disk)
- *    get_all_partitions()     (given the device number of a disk, return the
- *                              device numbers of all its known partitions)
- *
- * Partition stuff:
- *    add_partition()
- *    delete_partition()
- *    test_partition_in_use()  (also for test_disk_in_use)
- *
- * Geometry stuff:
- *    get_geometry()
- *    set_geometry()
- *    get_bios_drivedata()
- *
- * For today, only the partition stuff - aeb, 990515
- */
-#include <linux/compiler.h>
-#include <linux/ioctl.h>
-
-#define BLKPG      _IO(0x12,105)
-
-/* The argument structure */
-struct blkpg_ioctl_arg {
-        int op;
-        int flags;
-        int datalen;
-        void __user *data;
-};
-
-/* The subfunctions (for the op field) */
-#define BLKPG_ADD_PARTITION    1
-#define BLKPG_DEL_PARTITION    2
-#define BLKPG_RESIZE_PARTITION 3
-
-/* Sizes of name fields. Unused at present. */
-#define BLKPG_DEVNAMELTH       64
-#define BLKPG_VOLNAMELTH       64
-
-/* The data structure for ADD_PARTITION and DEL_PARTITION */
-struct blkpg_partition {
-       long long start;                /* starting offset in bytes */
-       long long length;               /* length in bytes */
-       int pno;                        /* partition number */
-       char devname[BLKPG_DEVNAMELTH]; /* partition name, like sda5 or c0d1p2,
-                                          to be used in kernel messages */
-       char volname[BLKPG_VOLNAMELTH]; /* volume label */
-};
-
-#endif /* _LINUX_BLKPG_H */
index 4d1a0748eaf8721c0cd4a34c0baf29ce455fc2d2..7c2e030e72f10542612ba34ce79b18f6b1b8ad06 100644 (file)
 #ifndef BLKTRACE_H
 #define BLKTRACE_H
 
-#include <linux/types.h>
-#ifdef __KERNEL__
 #include <linux/blkdev.h>
 #include <linux/relay.h>
 #include <linux/compat.h>
-#endif
-
-/*
- * Trace categories
- */
-enum blktrace_cat {
-       BLK_TC_READ     = 1 << 0,       /* reads */
-       BLK_TC_WRITE    = 1 << 1,       /* writes */
-       BLK_TC_FLUSH    = 1 << 2,       /* flush */
-       BLK_TC_SYNC     = 1 << 3,       /* sync IO */
-       BLK_TC_SYNCIO   = BLK_TC_SYNC,
-       BLK_TC_QUEUE    = 1 << 4,       /* queueing/merging */
-       BLK_TC_REQUEUE  = 1 << 5,       /* requeueing */
-       BLK_TC_ISSUE    = 1 << 6,       /* issue */
-       BLK_TC_COMPLETE = 1 << 7,       /* completions */
-       BLK_TC_FS       = 1 << 8,       /* fs requests */
-       BLK_TC_PC       = 1 << 9,       /* pc requests */
-       BLK_TC_NOTIFY   = 1 << 10,      /* special message */
-       BLK_TC_AHEAD    = 1 << 11,      /* readahead */
-       BLK_TC_META     = 1 << 12,      /* metadata */
-       BLK_TC_DISCARD  = 1 << 13,      /* discard requests */
-       BLK_TC_DRV_DATA = 1 << 14,      /* binary per-driver data */
-       BLK_TC_FUA      = 1 << 15,      /* fua requests */
-
-       BLK_TC_END      = 1 << 15,      /* we've run out of bits! */
-};
-
-#define BLK_TC_SHIFT           (16)
-#define BLK_TC_ACT(act)                ((act) << BLK_TC_SHIFT)
-
-/*
- * Basic trace actions
- */
-enum blktrace_act {
-       __BLK_TA_QUEUE = 1,             /* queued */
-       __BLK_TA_BACKMERGE,             /* back merged to existing rq */
-       __BLK_TA_FRONTMERGE,            /* front merge to existing rq */
-       __BLK_TA_GETRQ,                 /* allocated new request */
-       __BLK_TA_SLEEPRQ,               /* sleeping on rq allocation */
-       __BLK_TA_REQUEUE,               /* request requeued */
-       __BLK_TA_ISSUE,                 /* sent to driver */
-       __BLK_TA_COMPLETE,              /* completed by driver */
-       __BLK_TA_PLUG,                  /* queue was plugged */
-       __BLK_TA_UNPLUG_IO,             /* queue was unplugged by io */
-       __BLK_TA_UNPLUG_TIMER,          /* queue was unplugged by timer */
-       __BLK_TA_INSERT,                /* insert request */
-       __BLK_TA_SPLIT,                 /* bio was split */
-       __BLK_TA_BOUNCE,                /* bio was bounced */
-       __BLK_TA_REMAP,                 /* bio was remapped */
-       __BLK_TA_ABORT,                 /* request aborted */
-       __BLK_TA_DRV_DATA,              /* driver-specific binary data */
-};
-
-/*
- * Notify events.
- */
-enum blktrace_notify {
-       __BLK_TN_PROCESS = 0,           /* establish pid/name mapping */
-       __BLK_TN_TIMESTAMP,             /* include system clock */
-       __BLK_TN_MESSAGE,               /* Character string message */
-};
-
-
-/*
- * Trace actions in full. Additionally, read or write is masked
- */
-#define BLK_TA_QUEUE           (__BLK_TA_QUEUE | BLK_TC_ACT(BLK_TC_QUEUE))
-#define BLK_TA_BACKMERGE       (__BLK_TA_BACKMERGE | BLK_TC_ACT(BLK_TC_QUEUE))
-#define BLK_TA_FRONTMERGE      (__BLK_TA_FRONTMERGE | BLK_TC_ACT(BLK_TC_QUEUE))
-#define        BLK_TA_GETRQ            (__BLK_TA_GETRQ | BLK_TC_ACT(BLK_TC_QUEUE))
-#define        BLK_TA_SLEEPRQ          (__BLK_TA_SLEEPRQ | BLK_TC_ACT(BLK_TC_QUEUE))
-#define        BLK_TA_REQUEUE          (__BLK_TA_REQUEUE | BLK_TC_ACT(BLK_TC_REQUEUE))
-#define BLK_TA_ISSUE           (__BLK_TA_ISSUE | BLK_TC_ACT(BLK_TC_ISSUE))
-#define BLK_TA_COMPLETE                (__BLK_TA_COMPLETE| BLK_TC_ACT(BLK_TC_COMPLETE))
-#define BLK_TA_PLUG            (__BLK_TA_PLUG | BLK_TC_ACT(BLK_TC_QUEUE))
-#define BLK_TA_UNPLUG_IO       (__BLK_TA_UNPLUG_IO | BLK_TC_ACT(BLK_TC_QUEUE))
-#define BLK_TA_UNPLUG_TIMER    (__BLK_TA_UNPLUG_TIMER | BLK_TC_ACT(BLK_TC_QUEUE))
-#define BLK_TA_INSERT          (__BLK_TA_INSERT | BLK_TC_ACT(BLK_TC_QUEUE))
-#define BLK_TA_SPLIT           (__BLK_TA_SPLIT)
-#define BLK_TA_BOUNCE          (__BLK_TA_BOUNCE)
-#define BLK_TA_REMAP           (__BLK_TA_REMAP | BLK_TC_ACT(BLK_TC_QUEUE))
-#define BLK_TA_ABORT           (__BLK_TA_ABORT | BLK_TC_ACT(BLK_TC_QUEUE))
-#define BLK_TA_DRV_DATA        (__BLK_TA_DRV_DATA | BLK_TC_ACT(BLK_TC_DRV_DATA))
-
-#define BLK_TN_PROCESS         (__BLK_TN_PROCESS | BLK_TC_ACT(BLK_TC_NOTIFY))
-#define BLK_TN_TIMESTAMP       (__BLK_TN_TIMESTAMP | BLK_TC_ACT(BLK_TC_NOTIFY))
-#define BLK_TN_MESSAGE         (__BLK_TN_MESSAGE | BLK_TC_ACT(BLK_TC_NOTIFY))
-
-#define BLK_IO_TRACE_MAGIC     0x65617400
-#define BLK_IO_TRACE_VERSION   0x07
-
-/*
- * The trace itself
- */
-struct blk_io_trace {
-       __u32 magic;            /* MAGIC << 8 | version */
-       __u32 sequence;         /* event number */
-       __u64 time;             /* in microseconds */
-       __u64 sector;           /* disk offset */
-       __u32 bytes;            /* transfer length */
-       __u32 action;           /* what happened */
-       __u32 pid;              /* who did it */
-       __u32 device;           /* device number */
-       __u32 cpu;              /* on what cpu did it happen */
-       __u16 error;            /* completion error */
-       __u16 pdu_len;          /* length of data after this trace */
-};
-
-/*
- * The remap event
- */
-struct blk_io_trace_remap {
-       __be32 device_from;
-       __be32 device_to;
-       __be64 sector_from;
-};
-
-enum {
-       Blktrace_setup = 1,
-       Blktrace_running,
-       Blktrace_stopped,
-};
-
-#define BLKTRACE_BDEV_SIZE     32
-
-/*
- * User setup structure passed with BLKTRACESTART
- */
-struct blk_user_trace_setup {
-       char name[BLKTRACE_BDEV_SIZE];  /* output */
-       __u16 act_mask;                 /* input */
-       __u32 buf_size;                 /* input */
-       __u32 buf_nr;                   /* input */
-       __u64 start_lba;
-       __u64 end_lba;
-       __u32 pid;
-};
+#include <uapi/linux/blktrace_api.h>
 
-#ifdef __KERNEL__
 #if defined(CONFIG_BLK_DEV_IO_TRACE)
 
 #include <linux/sysfs.h>
@@ -250,5 +111,4 @@ extern void blk_fill_rwbs(char *rwbs, u32 rw, int bytes);
 
 #endif /* CONFIG_EVENT_TRACING && CONFIG_BLOCK */
 
-#endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/bpqether.h b/include/linux/bpqether.h
deleted file mode 100644 (file)
index a6c35e1..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef        __BPQETHER_H
-#define        __BPQETHER_H
-
-/*
- *     Defines for the BPQETHER pseudo device driver
- */
-
-#ifndef __LINUX_IF_ETHER_H
-#include <linux/if_ether.h>
-#endif
-
-#define SIOCSBPQETHOPT         (SIOCDEVPRIVATE+0)      /* reserved */
-#define SIOCSBPQETHADDR                (SIOCDEVPRIVATE+1)
-struct bpq_ethaddr {
-       unsigned char destination[ETH_ALEN];
-       unsigned char accept[ETH_ALEN];
-};
-
-/* 
- * For SIOCSBPQETHOPT - this is compatible with PI2/PacketTwin card drivers,
- * currently not implemented, though. If someone wants to hook a radio
- * to his Ethernet card he may find this useful. ;-)
- */
-
-#define SIOCGBPQETHPARAM       0x5000  /* get Level 1 parameters */
-#define SIOCSBPQETHPARAM       0x5001  /* set */
-
-struct bpq_req  {
-    int cmd;
-    int speed;                 /* unused */
-    int clockmode;             /* unused */
-    int txdelay;
-    unsigned char persist;     /* unused */
-    int slotime;               /* unused */
-    int squeldelay;
-    int dmachan;               /* unused */
-    int irq;                   /* unused */
-};
-
-#endif
index ecb4730d0868504d1ed9d0cb58a3522c38073695..7173f6e9d2dd55fbcba32070b15194f8538b9b1c 100644 (file)
@@ -1,67 +1,8 @@
 #ifndef BSG_H
 #define BSG_H
 
-#include <linux/types.h>
+#include <uapi/linux/bsg.h>
 
-#define BSG_PROTOCOL_SCSI              0
-
-#define BSG_SUB_PROTOCOL_SCSI_CMD      0
-#define BSG_SUB_PROTOCOL_SCSI_TMF      1
-#define BSG_SUB_PROTOCOL_SCSI_TRANSPORT        2
-
-/*
- * For flags member below
- * sg.h sg_io_hdr also has bits defined for it's flags member. However
- * none of these bits are implemented/used by bsg. The bits below are
- * allocated to not conflict with sg.h ones anyway.
- */
-#define BSG_FLAG_Q_AT_TAIL 0x10 /* default, == 0 at this bit, is Q_AT_HEAD */
-
-struct sg_io_v4 {
-       __s32 guard;            /* [i] 'Q' to differentiate from v3 */
-       __u32 protocol;         /* [i] 0 -> SCSI , .... */
-       __u32 subprotocol;      /* [i] 0 -> SCSI command, 1 -> SCSI task
-                                  management function, .... */
-
-       __u32 request_len;      /* [i] in bytes */
-       __u64 request;          /* [i], [*i] {SCSI: cdb} */
-       __u64 request_tag;      /* [i] {SCSI: task tag (only if flagged)} */
-       __u32 request_attr;     /* [i] {SCSI: task attribute} */
-       __u32 request_priority; /* [i] {SCSI: task priority} */
-       __u32 request_extra;    /* [i] {spare, for padding} */
-       __u32 max_response_len; /* [i] in bytes */
-       __u64 response;         /* [i], [*o] {SCSI: (auto)sense data} */
-
-        /* "dout_": data out (to device); "din_": data in (from device) */
-       __u32 dout_iovec_count; /* [i] 0 -> "flat" dout transfer else
-                                  dout_xfer points to array of iovec */
-       __u32 dout_xfer_len;    /* [i] bytes to be transferred to device */
-       __u32 din_iovec_count;  /* [i] 0 -> "flat" din transfer */
-       __u32 din_xfer_len;     /* [i] bytes to be transferred from device */
-       __u64 dout_xferp;       /* [i], [*i] */
-       __u64 din_xferp;        /* [i], [*o] */
-
-       __u32 timeout;          /* [i] units: millisecond */
-       __u32 flags;            /* [i] bit mask */
-       __u64 usr_ptr;          /* [i->o] unused internally */
-       __u32 spare_in;         /* [i] */
-
-       __u32 driver_status;    /* [o] 0 -> ok */
-       __u32 transport_status; /* [o] 0 -> ok */
-       __u32 device_status;    /* [o] {SCSI: command completion status} */
-       __u32 retry_delay;      /* [o] {SCSI: status auxiliary information} */
-       __u32 info;             /* [o] additional information */
-       __u32 duration;         /* [o] time to complete, in milliseconds */
-       __u32 response_len;     /* [o] bytes of response actually written */
-       __s32 din_resid;        /* [o] din_xfer_len - actual_din_xfer_len */
-       __s32 dout_resid;       /* [o] dout_xfer_len - actual_dout_xfer_len */
-       __u64 generated_tag;    /* [o] {SCSI: transport generated task tag} */
-       __u32 spare_out;        /* [o] */
-
-       __u32 padding;
-};
-
-#ifdef __KERNEL__
 
 #if defined(CONFIG_BLK_DEV_BSG)
 struct bsg_class_device {
@@ -89,6 +30,4 @@ static inline void bsg_unregister_queue(struct request_queue *q)
 }
 #endif
 
-#endif /* __KERNEL__ */
-
 #endif
index 5896e344ba6c91a1cf7c51a95b8ac57caf0cd9fa..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1,2 +0,0 @@
-header-y += big_endian.h
-header-y += little_endian.h
index 3c80fd7e8b567c8f6d8cd768c120926a424ec577..392041475c720148c4332b38ea81cd3d1460f425 100644 (file)
@@ -1,108 +1,7 @@
 #ifndef _LINUX_BYTEORDER_BIG_ENDIAN_H
 #define _LINUX_BYTEORDER_BIG_ENDIAN_H
 
-#ifndef __BIG_ENDIAN
-#define __BIG_ENDIAN 4321
-#endif
-#ifndef __BIG_ENDIAN_BITFIELD
-#define __BIG_ENDIAN_BITFIELD
-#endif
+#include <uapi/linux/byteorder/big_endian.h>
 
-#include <linux/types.h>
-#include <linux/swab.h>
-
-#define __constant_htonl(x) ((__force __be32)(__u32)(x))
-#define __constant_ntohl(x) ((__force __u32)(__be32)(x))
-#define __constant_htons(x) ((__force __be16)(__u16)(x))
-#define __constant_ntohs(x) ((__force __u16)(__be16)(x))
-#define __constant_cpu_to_le64(x) ((__force __le64)___constant_swab64((x)))
-#define __constant_le64_to_cpu(x) ___constant_swab64((__force __u64)(__le64)(x))
-#define __constant_cpu_to_le32(x) ((__force __le32)___constant_swab32((x)))
-#define __constant_le32_to_cpu(x) ___constant_swab32((__force __u32)(__le32)(x))
-#define __constant_cpu_to_le16(x) ((__force __le16)___constant_swab16((x)))
-#define __constant_le16_to_cpu(x) ___constant_swab16((__force __u16)(__le16)(x))
-#define __constant_cpu_to_be64(x) ((__force __be64)(__u64)(x))
-#define __constant_be64_to_cpu(x) ((__force __u64)(__be64)(x))
-#define __constant_cpu_to_be32(x) ((__force __be32)(__u32)(x))
-#define __constant_be32_to_cpu(x) ((__force __u32)(__be32)(x))
-#define __constant_cpu_to_be16(x) ((__force __be16)(__u16)(x))
-#define __constant_be16_to_cpu(x) ((__force __u16)(__be16)(x))
-#define __cpu_to_le64(x) ((__force __le64)__swab64((x)))
-#define __le64_to_cpu(x) __swab64((__force __u64)(__le64)(x))
-#define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
-#define __le32_to_cpu(x) __swab32((__force __u32)(__le32)(x))
-#define __cpu_to_le16(x) ((__force __le16)__swab16((x)))
-#define __le16_to_cpu(x) __swab16((__force __u16)(__le16)(x))
-#define __cpu_to_be64(x) ((__force __be64)(__u64)(x))
-#define __be64_to_cpu(x) ((__force __u64)(__be64)(x))
-#define __cpu_to_be32(x) ((__force __be32)(__u32)(x))
-#define __be32_to_cpu(x) ((__force __u32)(__be32)(x))
-#define __cpu_to_be16(x) ((__force __be16)(__u16)(x))
-#define __be16_to_cpu(x) ((__force __u16)(__be16)(x))
-
-static inline __le64 __cpu_to_le64p(const __u64 *p)
-{
-       return (__force __le64)__swab64p(p);
-}
-static inline __u64 __le64_to_cpup(const __le64 *p)
-{
-       return __swab64p((__u64 *)p);
-}
-static inline __le32 __cpu_to_le32p(const __u32 *p)
-{
-       return (__force __le32)__swab32p(p);
-}
-static inline __u32 __le32_to_cpup(const __le32 *p)
-{
-       return __swab32p((__u32 *)p);
-}
-static inline __le16 __cpu_to_le16p(const __u16 *p)
-{
-       return (__force __le16)__swab16p(p);
-}
-static inline __u16 __le16_to_cpup(const __le16 *p)
-{
-       return __swab16p((__u16 *)p);
-}
-static inline __be64 __cpu_to_be64p(const __u64 *p)
-{
-       return (__force __be64)*p;
-}
-static inline __u64 __be64_to_cpup(const __be64 *p)
-{
-       return (__force __u64)*p;
-}
-static inline __be32 __cpu_to_be32p(const __u32 *p)
-{
-       return (__force __be32)*p;
-}
-static inline __u32 __be32_to_cpup(const __be32 *p)
-{
-       return (__force __u32)*p;
-}
-static inline __be16 __cpu_to_be16p(const __u16 *p)
-{
-       return (__force __be16)*p;
-}
-static inline __u16 __be16_to_cpup(const __be16 *p)
-{
-       return (__force __u16)*p;
-}
-#define __cpu_to_le64s(x) __swab64s((x))
-#define __le64_to_cpus(x) __swab64s((x))
-#define __cpu_to_le32s(x) __swab32s((x))
-#define __le32_to_cpus(x) __swab32s((x))
-#define __cpu_to_le16s(x) __swab16s((x))
-#define __le16_to_cpus(x) __swab16s((x))
-#define __cpu_to_be64s(x) do { (void)(x); } while (0)
-#define __be64_to_cpus(x) do { (void)(x); } while (0)
-#define __cpu_to_be32s(x) do { (void)(x); } while (0)
-#define __be32_to_cpus(x) do { (void)(x); } while (0)
-#define __cpu_to_be16s(x) do { (void)(x); } while (0)
-#define __be16_to_cpus(x) do { (void)(x); } while (0)
-
-#ifdef __KERNEL__
 #include <linux/byteorder/generic.h>
-#endif
-
 #endif /* _LINUX_BYTEORDER_BIG_ENDIAN_H */