UAPI: (Scripted) Disintegrate include/linux

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>

1 files changed, 1 insertions, 107 deletions

diff --git a/include/linux/acct.h b/include/linux/acct.h
index d537aa0ec414..4a5b7cb56079 100644
--- a/include/linux/acct.h
+++ b/include/linux/acct.h
@@ -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.
- */
+#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 */