Merge tag 'disintegrate-main-20121013' of git://git.infradead.org/users/dhowells/linux-headers (0b381a28) · Commits · 戴 / test

include/linux/Kbuild

+0 −380

Original line number	Diff line number	Diff line
		@@ -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

include/linux/a.out.h

+1 −195

Original line number	Diff line number	Diff line
		#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

		#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. */

		#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__ */

include/linux/acct.h

+1 −107

Original line number	Diff line number	Diff line
		@@ -11,109 +11,11 @@
		* 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.
		*/

		#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
		#include <uapi/linux/acct.h>

		#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 */

include/linux/adb.h

+1 −38

Original line number	Diff line number	Diff line
		@@ -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 */

include/linux/adfs_fs.h

+1 −41

Original line number	Diff line number	Diff line
		#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

Admin message