Merge tag 'disintegrate-main-20121013' of git://git.infradead.org/users/dhowells/linux-headers

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

1 files changed, 1 insertions, 141 deletions

diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
index 4d1a0748eaf8..7c2e030e72f1 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
@@ -1,150 +1,11 @@
 #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